From af2948827d0cd2119a391921c3b1159410cdc649 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Tue, 19 Nov 2024 22:04:42 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20nb=20mod=C3=A9rations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/models.py                          | 10 +++++++++-
 .../templates/agenda_culturel/recent-activity-inc.html |  6 ++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py
index 5ce546c..f817b32 100644
--- a/src/agenda_culturel/models.py
+++ b/src/agenda_culturel/models.py
@@ -1520,7 +1520,15 @@ class Event(models.Model):
         nb_manual_import = imported.filter(Q(import_sources__len=0)|Q(nb_rimport=0)).count()
         nb_first_import = imported.filter(nb_rimport__gt=0).count()
 
-        return {"when": (start, start + timedelta(days=when[1] - 1)), "nb_manual_creation": nb_manual_creation, "nb_manual_import": nb_manual_import, "nb_first_import": nb_first_import, "nb_local_copies": nb_local_copies}
+        nb_moderated = Event.objects.filter(moderated_date__gte=start, moderated_date__lt=end).count()
+
+        return {"when": (start, start + timedelta(days=when[1] - 1)), 
+                "nb_manual_creation": nb_manual_creation, 
+                "nb_manual_import": nb_manual_import, 
+                "nb_first_import": nb_first_import, 
+                "nb_local_copies": nb_local_copies,
+                "nb_moderated": nb_moderated,
+        }
 
     def get_count_modifications(when_list):
         return [Event.get_count_modification(w) for w in when_list]
diff --git a/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html b/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html
index 33d5e03..7850819 100644
--- a/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html
@@ -6,20 +6,22 @@
         <thead>
             <tr>
                 <th>{% if modifications.0.when.0 == modifications.0.when.1 %}Date{% else %}Semaine{% endif %}</th>
+                <th>Modérations</th>
+                <th>Copies locales</th>
                 <th>Créations manuelles</th>
                 <th>Imports manuels</th>
                 <th>Imports automatiques</th>
-                <th>Créations de copies locales</th>
             </tr>
         </thead>
         <tbody>
             {% for m in modifications %}
             <tr>
                 <td>{{ m.when.0|date:'D j b' }}{% if modifications.0.when.0 != modifications.0.when.1 %} - {{ m.when.1|date:'D j b' }}{% endif %}</td>
+                <td>{{ m.nb_moderated }}</td>
+                <td>{{ m.nb_local_copies }}</td>
                 <td>{{ m.nb_manual_creation }}</td>
                 <td>{{ m.nb_manual_import }}</td>
                 <td>{{ m.nb_first_import }}</td>
-                <td>{{ m.nb_local_copies }}</td>
             </tr>
             {% endfor %}
             {% if next %}