Merge branch 'hotfix/comparaison_clear_id'

diff --git a/project/assets/css/dae.css b/project/assets/css/dae.css
index 9e905cc..73bfe1f 100644 (file)
--- a/project/assets/css/dae.css
+++ b/project/assets/css/dae.css
@@ -22,4 +22,7 @@ table.listing { width: 100%; }
 .total-row th, .total-row td { background-color: #C7D1D8; }
 tr td.spaced {
     padding-left: 25px;
+}
+.display-none {
+    display: none;
 }
\ No newline at end of file

diff --git a/project/assets/js/dae-embauche.js b/project/assets/js/dae-embauche.js
index 858d5b0..79bc7de 100644 (file)
--- a/project/assets/js/dae-embauche.js
+++ b/project/assets/js/dae-embauche.js
@@ -128,6 +128,21 @@ $(document).ready(function() {
         $(this).find('div').remove();
         input.val('');
 
+        var lnk = $(this).parent().find('.clear-cmp a');
+       lnk.show();
+       lnk.unbind('click');
+       lnk.click(function(e){
+           e.preventDefault();
+            $('#' + prefix_dossier_connexe + 'implantation').val('');
+            $('#' + prefix_dossier_connexe + 'classement').val('');
+            $('#' + prefix_dossier_connexe + 'cmp_dossier').val('');
+            $('#' + prefix_dossier_connexe + 'statut').val('');
+            $('#' + prefix_dossier_connexe + 'poste').val('');
+            $('#' + prefix_dossier_connexe + 'personne').val('');
+            $('#' + prefix_dossier_connexe + 'montant').val('');
+            $('#' + prefix_dossier_connexe + 'devise').val('');
+            $('#' + prefix_dossier_connexe + 'montant_euros').val('');
+           lnk.hide();
+       });
     });
-
 });

diff --git a/project/assets/js/dae-poste.js b/project/assets/js/dae-poste.js
index 5614bb7..9df7f57 100644 (file)
--- a/project/assets/js/dae-poste.js
+++ b/project/assets/js/dae-poste.js
@@ -296,6 +296,7 @@ $(document).ready(function() {
             $('#' + prefix_poste_connexe + 'statut').val(data['statut']);
             $('#' + prefix_poste_connexe + 'classement').val(data['classement']);
         });
+       
         chargement_poste.error(function(data) {
             alert(data.responseText);
         });
@@ -304,7 +305,20 @@ $(document).ready(function() {
         $(this).find('div').remove();
         input.val('');
 
+        var lnk = $(this).parent().find('.clear-cmp a');
+       lnk.show();
+       lnk.unbind('click');
+       lnk.click(function(e){
+           e.preventDefault();
+            $('#' + prefix_poste_connexe + 'implantation').val('');
+            $('#' + prefix_poste_connexe + 'cmp_poste').val('');
+            $('#' + prefix_poste_connexe + 'nom').val('');
+            $('#' + prefix_poste_connexe + 'montant').val('');
+            $('#' + prefix_poste_connexe + 'devise').val('');
+            $('#' + prefix_poste_connexe + 'montant_euros').val('');
+            $('#' + prefix_poste_connexe + 'statut').val('');
+            $('#' + prefix_poste_connexe + 'classement').val('');
+           lnk.hide();
+       });
     });
-
-
 });

diff --git a/project/dae/templates/dae/embauche.html b/project/dae/templates/dae/embauche.html
index 7a97987..5248767 100644 (file)
--- a/project/dae/templates/dae/embauche.html
+++ b/project/dae/templates/dae/embauche.html
@@ -103,7 +103,7 @@
         {% for field in f %}
             {% if field.is_hidden %}{{ field }}{% endif %}
         {% endfor %}
-        <tr><td colspan=2>Rechercher (personne, poste) : {{ f.recherche }}</td></tr>
+        <tr><td colspan=2>Rechercher (personne, poste) : {{ f.recherche }} <span class="clear-cmp"><a href="#" class="display-none">Supprimmer</a></span></td></tr>
         <tr><th>{{ f.implantation.label }}</th><td>{{ f.implantation.errors }} {{ f.implantation }}</td></tr>
         <tr><th>{{ f.poste.label }}</th><td>{{ f.poste.errors }} {{ f.poste }}</td></tr>
         <tr><th>{{ f.personne.label }}</th><td>{{ f.personne.errors }} {{ f.personne }}</td></tr>

diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index aeffe37..89511d1 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -319,7 +319,7 @@ Demande d'autorisation d'engagement
         {% for field in f %}
             {% if field.is_hidden %}{{ field }}{% endif %}
         {% endfor %}
-        <tr class="comparaison-interne"><td colspan=2>Rechercher un poste : {{ f.recherche }}</td></tr>
+        <tr class="comparaison-interne"><td colspan=2>Rechercher un poste : {{ f.recherche }} <span class="clear-cmp"><a href="#" class="display-none">Supprimmer</a></span></td></tr>
         <tr><th>{{ f.implantation.label }}</th><td>{{ f.implantation.errors }} {{ f.implantation }}</td></tr>
         <tr><th>{{ f.nom.label }}</th><td>{{ f.nom.errors }} {{ f.nom }}</td></tr>
         <tr><th>{{ f.statut.label }}</th><td>{{ f.statut.errors }} {{ f.statut}}</td></tr>