Hot fix to delete comparisons

diff --git a/project/assets/js/dae-embauche.js b/project/assets/js/dae-embauche.js
index 79bc7de..fd9b76b 100644 (file)
--- a/project/assets/js/dae-embauche.js
+++ b/project/assets/js/dae-embauche.js
@@ -127,22 +127,5 @@ $(document).ready(function() {
         /* on ne veut pas afficher la personne en-dessous */
         $(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 9df7f57..ecf51bd 100644 (file)
--- a/project/assets/js/dae-poste.js
+++ b/project/assets/js/dae-poste.js
@@ -304,21 +304,5 @@ $(document).ready(function() {
         /* on ne veut pas afficher la personne en-dessous */
         $(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/forms.py b/project/dae/forms.py
index 373099f..f176318 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -246,7 +246,8 @@ class DossierComparaisonForm(
         exclude = ('dossier',)
 
 DossierComparaisonFormSet = modelformset_factory(
-    dae.DossierComparaison, extra=3, max_num=3, form=DossierComparaisonForm
+    dae.DossierComparaison, extra=3, max_num=3,
+    form=DossierComparaisonForm, can_delete=True,
 )
 
 

diff --git a/project/dae/templates/dae/embauche.html b/project/dae/templates/dae/embauche.html
index 0122cff..0d5148b 100644 (file)
--- a/project/dae/templates/dae/embauche.html
+++ b/project/dae/templates/dae/embauche.html
@@ -103,7 +103,11 @@
         {% for field in f %}
             {% if field.is_hidden %}{{ field }}{% endif %}
         {% endfor %}
-        <tr><td colspan=2>Rechercher (personne, poste) : {{ f.recherche }} <span class="clear-cmp"><a href="#" class="display-none">Supprimmer</a></span></td></tr>
+        <tr>
+         <td colspan=2>Rechercher (personne, poste) : {{ f.recherche }}
+           {% if f.id.value %}Supprimmer: <input type="checkbox" name="{{ f.prefix }}-DELETE" />{% endif %}
+         </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 89511d1..aa7bc34 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -318,8 +318,12 @@ Demande d'autorisation d'engagement
         <table>
         {% for field in f %}
             {% if field.is_hidden %}{{ field }}{% endif %}
-        {% endfor %}
-        <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>
+        {% endfor %}   
+        <tr class="comparaison-interne">
+         <td colspan=2>Rechercher un poste : {{ f.recherche }}
+           {% if f.id.value %}Supprimmer: <input type="checkbox" name="{{ f.prefix }}-DELETE" />{% endif %}
+         </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>

diff --git a/project/dae/views.py b/project/dae/views.py
index 59801bd..c087e47 100644 (file)
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -482,7 +482,7 @@ def embauche(request, key=None, dossier_id=None):
             request.POST,
             queryset=dossier.dae_comparaisons.ma_region_ou_service(
                 request.user
-            )
+            ),
         )
         
         remunForm = RemunForm(request.POST, instance=dossier)