From 1dead2a69583aa5a6fd91d7fb8b722351312b4f5 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Mon, 11 Nov 2024 18:14:47 +0100 Subject: [PATCH] =?UTF-8?q?On=20int=C3=A8gre=20des=20=C3=A9v=C3=A9nements?= =?UTF-8?q?=20pass=C3=A9s=20=C3=A0=20la=20trappe=20dans=20le=20d=C3=A9comp?= =?UTF-8?q?te?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 770e073..ce4bb3f 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -1437,9 +1437,9 @@ class Event(models.Model): nb_manual_creation = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=True).count() - imported = Event.objects.filter(created_date__gte=start, created_date__lt=end, imported_date__isnull=False, import_sources__len__gt=0).annotate(nb_rimport=Subquery(recurrentimport)) + 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(nb_rimport=0).count() + 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}