readonly et fourchette du poste

diff --git a/project/dae/templates/dae/embauche-dossier.html b/project/dae/templates/dae/embauche-dossier.html
index 1089a2d..bfcd687 100644 (file)
--- a/project/dae/templates/dae/embauche-dossier.html
+++ b/project/dae/templates/dae/embauche-dossier.html
@@ -24,17 +24,17 @@
             <th>Type de contrat</th>
         </tr>
         <tr>
-            <td>{{ form.classement_anterieur }}<br />
+            <td>{{ form.instance.classement_anterieur|default:"" }}<br />
                 {{ form.classement_anterieur.errors }}
             </td>
             {% comment %}<td>val point</td>{% endcomment %}
-            <td>{{ form.salaire_anterieur }}<br />
+            <td>{{ form.instance.salaire_anterieur|default:"" }}<br />
                 {{ form.salaire_anterieur.errors }}
             </td>
             <td>{% comment %}${% endcomment %}</td>
             <td>{% comment %}0.00{% endcomment %}</td>
             <td>{% comment %}€{% endcomment %}</td>
-            <td>{{ form.statut_anterieur }}<br />
+            <td>{{ form.instance.statut_anterieur|default:"" }}<br />
                 {{ form.statut_anterieur.errors }}
             </td>
             <td></td>
@@ -46,7 +46,7 @@
         </tr>
         <tr>
             <td colspan="7">
-                {{ form.employe_anterieur }}
+                {{ form.instance.employe_anterieur }}
                 {% comment %} - 
                 <span id="info_employe" class="info">Nom du poste visé</span>
                 {% endcomment %}<br />
@@ -61,15 +61,15 @@
             <th></th>
         </tr>
         <tr>
-            <td>{{ form.classement_titulaire_anterieur }}<br />
+            <td>{{ form.instance.classement_titulaire_anterieur }}<br />
                 {{ form.classement_titulaire_anterieur.errors }}
             </td>
             {% comment %}<td>val point</td>{% endcomment %}
-            <td>{{ form.salaire_titulaire_anterieur }}</td>
+            <td>{{ form.instance.salaire_titulaire_anterieur }}</td>
             <td>{% comment %}${% endcomment %}</td>
             <td>{% comment %}0.00{% endcomment %}</td>
             <td>{% comment %}€{% endcomment %}</td>
-            <td>{{ form.statut_titulaire_anterieur }}</td>
+            <td>{{ form.instance.statut_titulaire_anterieur }}</td>
             <td></td>
         </tr>
         <tr>
@@ -96,13 +96,13 @@
                 {{ form.classement.errors }}
             </td>
             {% comment %}<td>val point</td>{% endcomment %}
-            <td>{{ form.salaire }}</td>
+            <td>{{ form.salaire }} <span class="info">(fourchette du poste : {{ poste.salaire_min }} {{ poste.devise_min.code }} - {{ poste.salaire_max }} {{ poste.devise_max.code }})</span></td>
             <td>{% comment %}${% endcomment %}</td>
             <td>{% comment %}0.00{% endcomment %}</td>
             <td>€</td>
             <td colspan="2"></td>
         </tr>
-        </tboby>
+        </tbody>
     </table>
     </fieldset>
     

diff --git a/project/dae/templates/dae/embauche.html b/project/dae/templates/dae/embauche.html
index 1825d1d..0d2b26c 100644 (file)
--- a/project/dae/templates/dae/embauche.html
+++ b/project/dae/templates/dae/embauche.html
@@ -18,6 +18,8 @@
   <script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
   <script type="text/javascript" src="{% admin_media_prefix %}js/calendar.js"></script>
   <script type="text/javascript" src="{% admin_media_prefix %}js/admin/DateTimeShortcuts.js"></script>
+  <script src="{{ MEDIA_URL }}js/dae.js" type="text/javascript"></script>
+  <script src="{{ MEDIA_URL }}js/dae-embauche.js" type="text/javascript"></script>
 
   <style>
     h2.section {

diff --git a/project/media/js/dae-embauche.js b/project/media/js/dae-embauche.js
new file mode 100644 (file)
index 0000000..a90b28c
--- /dev/null
+++ b/project/media/js/dae-embauche.js
@@ -0,0 +1,6 @@
+/*******************************************************************************
+*          EMBAUCHE
+*******************************************************************************/
+
+$(document).ready(function() {
+});