ajout de marquage traité pour les rapports de modif

[auf_rh_dae.git] / project / rh / views.py

diff --git a/project/rh/views.py b/project/rh/views.py
index 04e55a4..0a53a19 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -5,6 +5,7 @@ from datetime import date
 from decimal import Decimal
 
 import pygraphviz as pgv
+from reversion.models import Revision
 
 from auf.django.references import models as ref
 from django.conf import settings
@@ -12,9 +13,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse
-from django.shortcuts import render, get_object_or_404
-
-from reversion.models import Revision
+from django.shortcuts import render, get_object_or_404, redirect
 
 from project.decorators import drh_or_admin_required
 from project.decorators import region_protected
@@ -27,7 +26,7 @@ from project.rh.change_list import RechercheTemporelle
 from project.rh.forms import MasseSalarialeForm
 from project.rh.lib import get_lookup_params
 from project.rh.templatetags.rapports import SortHeaders
-from project.rh.historique import format_revisions
+from project.rh.historique import get_active_revisions, TodoForm
 
 TWOPLACES = Decimal('0.01')
 
@@ -789,7 +788,7 @@ def historique_des_modifications(request,):
 
     from django.core.paginator import Paginator
 
-    revisions = Revision.objects.exclude(user__isnull=True).order_by('-date_created')
+    revisions = get_active_revisions()
     paginator = Paginator(revisions, 50)
     page = request.GET.get('page')
     try:
@@ -797,12 +796,24 @@ def historique_des_modifications(request,):
     except:
         page_revisions = paginator.page(1)
 
-    results = format_revisions(page_revisions.object_list)
+    results = page_revisions.object_list
+    if request.POST:
+        form = TodoForm(request.POST, revisions=results)
+        if form.is_valid():
+            for id in form.cleaned_data['items']:
+                revision = Revision.objects.get(id=id)
+                rh.ModificationTraite(revision=revision).save()
+            return redirect(reverse('rhr_historique_des_modifications'))
+    else:
 
+        form = TodoForm(revisions=results)
+    
     c = {
-            'headers': ('Date', 'Auteur', 'Type', 'Objet', 'Historique', 'Commentaire',  ),
+            'headers': ('Date', 'Auteur', 'Type', 'Objet', 'Historique',
+                'Commentaire',  'Traité'),
             'revisions': results,
             'page': page_revisions,
+            'form': form,
     }
 
     return render(request, 'rh/rapports/historique_des_modifications.html', c)