Ajout d'informations sur les événements importés à venir

This commit is contained in:
Jean-Marie Favreau 2025-02-07 16:44:45 +01:00
parent ce7576e9ae
commit c795803073
2 changed files with 20 additions and 3 deletions

View File

@ -60,8 +60,7 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</article> </article>
<article> <article>
<header> <header>
<h2>Activité des derniers jours</h2> <h2>Activité des derniers jours</h2>
@ -75,6 +74,13 @@
<p>Détail des imports récurrents&nbsp;: <p>Détail des imports récurrents&nbsp;:
{% include "agenda_culturel/rimports-info-inc.html" with all=1 %}</p> {% include "agenda_culturel/rimports-info-inc.html" with all=1 %}</p>
<h3>Synthèse des événements importés</h3>
<p>En ne considérant que les événements à venir, on compte&nbsp;:</p>
<ul>
<li>Nombre d'événements issus d'importations récurrentes&nbsp;: {{ nb_in_rimport }}</li>
<li>Nombre d'événements issus d'importations uniques&nbsp;: {{ nb_in_orphan_import }}</li>
</ul>
</article> </article>
</div> </div>

View File

@ -1037,6 +1037,16 @@ def administration(request):
.count()) .count())
nb_all = imported_events.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 # get all non moderated events
nb_not_moderated = Event.get_nb_not_moderated(today, nb_mod_days, nb_classes) 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, "events": events, "batch_imports": batch_imports,
"nb_failed": nb_failed, "nb_canceled": nb_canceled, "nb_failed": nb_failed, "nb_canceled": nb_canceled,
"nb_running": nb_running, "nb_all": nb_all, "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},
) )