From 7657f5e7c9c5540e96b7fa60e04d4881a0c84286 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Fri, 25 Mar 2005 16:02:08 +0000
Subject: [PATCH] wish 82, recherche avancee pour le poste et la fonction dans
 l'entreprise

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-519
---
 ChangeLog                     |  1 +
 htdocs/advanced_search.php    |  5 +++--
 templates/search.adv.form.tpl | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 884b0fa..d75ba2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ Bug/Wish :
 		- #278: professionnal email and web site.							-Car
 
 	* Search :
+		- #82: Search by fonction and post for jobs.						-Car
 		- #109, 288: Lots of sorting methods for search.					-Car
 		- #270: Private/public flags are now used for search.				-Car
 
diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index 57a865f..8d6f438 100644
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -87,7 +87,8 @@ if (!Env::has('rechercher')) {
         $regionField     = new RefSField('region',array('ar.region'),'adresses','ar','u.user_id=ar.uid');
        
         $entrepriseField = new RefSField('entreprise',array('ee.entreprise'),'entreprises','ee','u.user_id=ee.uid',false);
-        $posteField      = new RefSField('poste',array('ep.fonction'),'entreprises','ep','u.user_id=ep.uid');
+        $posteField      = new RefSField('poste',array('ep.poste'),'entreprises','ep','u.user_id=ep.uid', false);
+        $fonctionField   = new RefSField('fonction',array('ef.fonction'),'entreprises','ef','u.user_id=ef.uid');
         $secteurField    = new RefSField('secteur',array('fm.secteur'),'entreprises','fm','u.user_id=fm.uid');
         $cvField         = new RefSField('cv',array('u.cv'),'','','',false);
        
@@ -106,7 +107,7 @@ if (!Env::has('rechercher')) {
                     $townField, $countryField, $regionField, $entrepriseField,
                     $posteField, $secteurField, $cvField, $natField, $binetField,
                     $groupexField, $sectionField, $schoolField, $diplomaField,
-                    $freeField)
+                    $freeField, $fonctionField)
                 );
 
     
diff --git a/templates/search.adv.form.tpl b/templates/search.adv.form.tpl
index acd19ab..be08974 100644
--- a/templates/search.adv.form.tpl
+++ b/templates/search.adv.form.tpl
@@ -169,12 +169,12 @@
       <td><input type="text" name="entreprise" size="32" value="{$smarty.request.entreprise}" /></td>
     </tr>
     <tr>
-      <td>Poste</td>
+      <td>Fonction</td>
       <td>
-        <select name="poste">
+        <select name="fonction">
           <option value="0"></option>
           {iterate from=$choix_postes item=cp}
-          <option value="{$cp.id}" {if $smarty.request.poste eq $cp.id}selected{/if}>
+          <option value="{$cp.id}" {if $smarty.request.fonction eq $cp.id}selected{/if}>
             {$cp.fonction_fr}
           </option>
           {/iterate}
@@ -182,6 +182,10 @@
       </td>
     </tr>
     <tr>
+      <td>Poste</td>
+      <td><input type="text" name="poste" size="32" value="{$smarty.request.poste}" /></td>
+    </tr>
+    <tr>
       <td>Secteur</td>
       <td>
         <select name="secteur">
-- 
2.1.4