fix form poste

[auf_rh_dae.git] / project / dae / templates / dae / poste.html

diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index ccb13b2..7ced63e 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -85,10 +85,10 @@ Demande d'autorisation d'embauche
     <table>
         <tbody>
         <tr>
-            <th>{{ form.statut_residence.label_tag }} :<br />{{ form.statut_residence.errors }}</th>
+            <th>Statut :<br />{{ form.local.errors }} {{ form.expatrie.errors }}</th>
             <td>
                 <span class="row">
-                {{ form.statut_residence }} 
+                {{ form.local.label_tag }}  {{ form.local }} {{ form.expatrie.label_tag }} {{ form.expatrie }} 
                 {{ form.mise_a_disposition.label_tag }} 
                 {{ form.mise_a_disposition.errors }} 
                 {{ form.mise_a_disposition }}
@@ -153,7 +153,6 @@ Demande d'autorisation d'embauche
         <tr>
             <th></th>
             <th>Échelon AUF</th>
-            <th>Coefficient</th>
             <th>Valeur du point</th>
             <th>Devise</th>
             <th colspan="2">Salaire de base</th>
@@ -170,10 +169,6 @@ Demande d'autorisation d'embauche
                 {{ form.classement_min.errors }}
             </td>
             <td>
-                {{ form.coefficient_min }}
-                {{ form.coefficient_min.errors }}
-            </td>
-            <td>
                 {{ form.valeur_point_min }}
                 {{ form.valeur_point_min.errors }}
             </td>
@@ -203,10 +198,6 @@ Demande d'autorisation d'embauche
                 {{ form.classement_max.errors }}
             </td>
             <td>
-                {{ form.coefficient_max }}
-                {{ form.coefficient_max.errors }}
-            </td>
-            <td>
                 {{ form.valeur_point_max }}
                 {{ form.valeur_point_max.errors }}
             </td>
@@ -250,41 +241,31 @@ Demande d'autorisation d'embauche
         </tr>
         </tbody>
     </table>
-    <table>
+    <table id="elements-comparaison">
         <tbody>
         <tr>
             <th></th>
-            <th colspan="2">Entreprise locale</th>
-            <th colspan="2">Université</th>
-            <th colspan="2">Fonction publique</th>
-            <th colspan="2">ONG</th>
-            <th colspan="2">Autre</th>
+            <th>Université</th>
+            <th>Fonction publique</th>
+            <th>Entreprise locale</th>
+            <th>ONG</th>
+            <th>Autre</th>
         </tr>
         <tr>
             <th>Minimum</th>
-            <td>{{ form.comp_locale_min }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_universite_min }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_fonctionpub_min }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_ong_min }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_autre_min }}</td>
-            <td><span class="devise_comp_code">€</span></td>
+            <td>{{ form.comp_universite_min }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_fonctionpub_min }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_locale_min }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_ong_min }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_autre_min }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
         </tr>
         <tr>
             <th>Maximum</th>
-            <td>{{ form.comp_locale_max }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_universite_max }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_fonctionpub_max }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_ong_max }}</td>
-            <td><span class="devise_comp_code">€</span></td>
-            <td>{{ form.comp_autre_max }}</td>
-            <td><span class="devise_comp_code">€</span></td>
+            <td>{{ form.comp_universite_max }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_fonctionpub_max }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_locale_max }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_ong_max }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
+            <td>{{ form.comp_autre_max }}<span class="devise"></span> (<span class="devise_euro"></span>)</td>
         </tr>
         </tbody>
     </table>
@@ -313,7 +294,6 @@ Demande d'autorisation d'embauche
     </div>
     </fieldset>
 
-    {{ form.etat }}
     <input type="submit" name="save" value="Sauvegarder" />
 
 </form>