From bed096fc4a5774715e83edf0d4cf30618ae979db Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Fri, 18 May 2012 14:38:57 -0400 Subject: [PATCH 1/1] =?utf8?q?[#3125]=20Suppression=20des=20DAE=20finalis=C3?= =?utf8?q?=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dae/templates/dae/embauches_finalisees.html | 67 +++++++++++--------- project/dae/views.py | 15 +++++ 2 files changed, 51 insertions(+), 31 deletions(-) diff --git a/project/dae/templates/dae/embauches_finalisees.html b/project/dae/templates/dae/embauches_finalisees.html index 32013dd..9ed6f0b 100644 --- a/project/dae/templates/dae/embauches_finalisees.html +++ b/project/dae/templates/dae/embauches_finalisees.html @@ -26,35 +26,40 @@ - - - - {% sort_header "region" "Région" %} - {% sort_header "implantation" "Implantation" %} - {% sort_header "poste" "Poste" %} - {% sort_header "personne" "Personne" %} - {% sort_header "debut_contrat" "Début du contrat" %} - {% sort_header "fin_contrat" "Fin du contrat" %} - - - - - {% for dossier in embauches.object_list %} - - - - - - - - - {% endif %} - - - {% endfor %} - -
{{ dossier.poste.implantation|region_ou_service }}{{ dossier.poste.implantation }}{{ dossier.poste.nom }}{{ dossier.employe }}{{ dossier.contrat_date_debut|date:"d-m-Y" }}{{ dossier.contrat_date_fin|date:"d-m-Y" }} - {% if not dossier.dossier_rh %} - Importer
-{% pagination embauches %} +
+ + + + + {% sort_header "region" "Région" %} + {% sort_header "implantation" "Implantation" %} + {% sort_header "poste" "Poste" %} + {% sort_header "personne" "Personne" %} + {% sort_header "debut_contrat" "Début du contrat" %} + {% sort_header "fin_contrat" "Fin du contrat" %} + + + + + {% for dossier in embauches.object_list %} + + + + + + + + + + {% endif %} + + + {% endfor %} + +
{{ dossier.poste.implantation|region_ou_service }}{{ dossier.poste.implantation }}{{ dossier.poste.nom }}{{ dossier.employe }}{{ dossier.contrat_date_debut|date:"d-m-Y" }}{{ dossier.contrat_date_fin|date:"d-m-Y" }} + {% if not dossier.dossier_rh %} + Importer
+ {% pagination embauches %} + +
{% endblock %} diff --git a/project/dae/views.py b/project/dae/views.py index bb40f29..f1420ca 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -473,6 +473,21 @@ def embauches_liste(request): @dae_groupe_requis def embauches_finalisees(request): """Liste des embauches finalisées.""" + + ### POST + + if request.method == 'POST': + if 'supprimer' in request.POST: + ids = request.POST.getlist('ids') + dossiers = dae.Dossier.objects.filter(id__in=ids) + count = dossiers.count() + if count > 0: + dossiers.delete() + messages.success(request, u'%d dossiers supprimés' % count) + return redirect(request.get_full_path()) + + ### GET + embauches = dae.Dossier.objects.ma_region_ou_service(request.user) \ .filter(etat=DOSSIER_ETAT_FINALISE) -- 1.7.10.4