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 4c2908c..7ced63e 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -18,26 +18,20 @@ Demande d'autorisation d'embauche
     window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";
   </script>
   <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/calendrier.css" />
     window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";
   </script>
   <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/calendrier.css" />

+  <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/dae.css" />
+

   <script type="text/javascript" src="/admin/jsi18n/"></script>
   <script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 
   {{ form.media }}
 
   <script type="text/javascript" src="/admin/jsi18n/"></script>
   <script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
 
   {{ form.media }}
 

+  <script src="{{ MEDIA_URL }}jquery-autocomplete/jquery.autocomplete.js" type="text/javascript"></script>
+  <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}jquery-autocomplete/jquery.autocomplete.css" />
+
+

   <script src="{{ MEDIA_URL }}js/dae.js" /></script>
   <script src="{{ MEDIA_URL }}js/dae-poste.js" /></script>
 
   <script src="{{ MEDIA_URL }}js/dae.js" /></script>
   <script src="{{ MEDIA_URL }}js/dae-poste.js" /></script>
 

-  <style>
-    .row {padding: 10px 0px; clear: both; display:block;}
-    .row * {float: left; margin: 0px; padding: 0px; margin-right: 4px;}
-    .row li {list-style-type: none;}
-    .underline {text-decoration: underline;}
-    .clear {display: block; clear: both;}
-    .note {text-decoration: underline; font-style: italic; margin-left: 12px;}
-    .info {font-size:13px;  font-style: italic;}
-    .noborder {border:none; margin:0; padding; 0}
-    tr.noborder td {border:none; padding-left: 0;}
-
-  </style>

 {% endblock %}
 
 {% block main %}
 {% endblock %}
 
 {% block main %}

@@ -77,7 +71,10 @@ Demande d'autorisation d'embauche
         </tr>
         <tr>
             <th>{{ form.responsable.label_tag }} :<br />{{ form.responsable.errors }}</th>
         </tr>
         <tr>
             <th>{{ form.responsable.label_tag }} :<br />{{ form.responsable.errors }}</th>

-            <td>{{ form.responsable }}</td>
+            <td>
+                <span class="info">Recherche intelligente : vous pouvez tapez le nom du poste, ou encore la dernière qui occupe celui-ci. Assurez-vous que le poste de responsable choisi dans la liste est reporté en dessous du champs de recherche, cela signifie qu'il est sélectionné.</span>
+                {{ form.responsable }}
+            </td>

         </tr>
         </tbody>
     </table>
         </tr>
         </tbody>
     </table>

@@ -88,10 +85,10 @@ Demande d'autorisation d'embauche
     <table>
         <tbody>
         <tr>
     <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">
             <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 }}
                 {{ form.mise_a_disposition.label_tag }} 
                 {{ form.mise_a_disposition.errors }} 
                 {{ form.mise_a_disposition }}

@@ -156,7 +153,6 @@ Demande d'autorisation d'embauche
         <tr>
             <th></th>
             <th>Échelon AUF</th>
         <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>
             <th>Valeur du point</th>
             <th>Devise</th>
             <th colspan="2">Salaire de base</th>

@@ -173,10 +169,6 @@ Demande d'autorisation d'embauche
                 {{ form.classement_min.errors }}
             </td>
             <td>
                 {{ 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>
                 {{ form.valeur_point_min }}
                 {{ form.valeur_point_min.errors }}
             </td>

@@ -206,10 +198,6 @@ Demande d'autorisation d'embauche
                 {{ form.classement_max.errors }}
             </td>
             <td>
                 {{ 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>
                 {{ form.valeur_point_max }}
                 {{ form.valeur_point_max.errors }}
             </td>

@@ -253,41 +241,31 @@ Demande d'autorisation d'embauche
         </tr>
         </tbody>
     </table>
         </tr>
         </tbody>
     </table>

-    <table>
+    <table id="elements-comparaison">

         <tbody>
         <tr>
             <th></th>
         <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>
         </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>
         </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>
         </tr>
         </tbody>
     </table>

@@ -316,7 +294,6 @@ Demande d'autorisation d'embauche
     </div>
     </fieldset>
 
     </div>
     </fieldset>
 

-    {{ form.etat }}

     <input type="submit" name="save" value="Sauvegarder" />
 
 </form>
     <input type="submit" name="save" value="Sauvegarder" />
 
 </form>