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 @@ {% if modifications.0.when.0 == modifications.0.when.1 %}Date{% else %}Semaine{% endif %} + Modérations + Copies locales Créations manuelles Imports manuels Imports automatiques - Créations de copies locales {% for m in modifications %} {{ m.when.0|date:'D j b' }}{% if modifications.0.when.0 != modifications.0.when.1 %} - {{ m.when.1|date:'D j b' }}{% endif %} + {{ m.nb_moderated }} + {{ m.nb_local_copies }} {{ m.nb_manual_creation }} {{ m.nb_manual_import }} {{ m.nb_first_import }} - {{ m.nb_local_copies }} {% endfor %} {% if next %}