From d4a12cadcdb06a0c2a076a8696c404205aa9e90c Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Mon, 11 Nov 2024 19:17:40 +0100 Subject: [PATCH] =?UTF-8?q?Pr=C3=A9cisions=20sur=20les=20=C3=A9v=C3=A9neme?= =?UTF-8?q?nts=20cr=C3=A9=C3=A9s=20"manuellement"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/models.py | 6 ++++-- .../templates/agenda_culturel/recent-activity-inc.html | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index ce4bb3f..f578f1e 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -1436,13 +1436,15 @@ class Event(models.Model): recurrentimport = RecurrentImport.objects.filter(source=OuterRef("import_sources__0")).order_by().annotate(count=Func(F('id'), function='Count')).values('count') - nb_manual_creation = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=True).count() + nb_manual_creation = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=True, uuids__len=0).count() + nb_local_copies = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=True, uuids__len__gt=0).count() + imported = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=False, uuids__len__gt=0).annotate(nb_rimport=Subquery(recurrentimport)) 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} + 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} 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 41968e9..0356a55 100644 --- a/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html @@ -8,6 +8,7 @@ Créations manuelles Imports manuels Imports automatiques + Créations de copies locales @@ -17,6 +18,7 @@ {{ m.nb_manual_creation }} {{ m.nb_manual_import }} {{ m.nb_first_import }} + {{ m.nb_local_copies }} {% endfor %}