diff --git a/src/agenda_culturel/templates/agenda_culturel/administration.html b/src/agenda_culturel/templates/agenda_culturel/administration.html index ab9325b..d851f3e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/administration.html +++ b/src/agenda_culturel/templates/agenda_culturel/administration.html @@ -60,8 +60,7 @@ {% endfor %} - - +

Activité des derniers jours

@@ -75,6 +74,13 @@

Détail des imports récurrents : {% include "agenda_culturel/rimports-info-inc.html" with all=1 %}

+

Synthèse des événements importés

+

En ne considérant que les événements à venir, on compte :

+ +
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 6cd71fb..f6d2c74 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -1037,6 +1037,16 @@ def administration(request): .count()) nb_all = imported_events.count() + # get some info about imported (or not) events + srcs = RecurrentImport.objects.all().values_list("source") + in_future = Event.objects.filter(Q(start_day__gte=today)) + nb_in_rimport = in_future.filter(Q(import_sources__overlap=srcs)).count() + nb_in_orphan_import = in_future.filter( + (Q(import_sources__isnull=False) & + (Q(modified_date__isnull=True) | + Q(modified_date__lte=F('imported_date')))) + & ~Q(import_sources__overlap=srcs)).count() + # get all non moderated events nb_not_moderated = Event.get_nb_not_moderated(today, nb_mod_days, nb_classes) @@ -1048,7 +1058,8 @@ def administration(request): "events": events, "batch_imports": batch_imports, "nb_failed": nb_failed, "nb_canceled": nb_canceled, "nb_running": nb_running, "nb_all": nb_all, - "nb_not_moderated": nb_not_moderated}, + "nb_not_moderated": nb_not_moderated, + "nb_in_rimport": nb_in_rimport, "nb_in_orphan_import": nb_in_orphan_import}, )