From 47d2476b51c6a10f4e95230c14d657a3af5227f0 Mon Sep 17 00:00:00 2001
From: Ehouarn <ehouarn@crans.org>
Date: Thu, 25 Sep 2025 00:08:56 +0200
Subject: [PATCH] Allow to view activity entries on Activity tab

---
 .../activity/includes/activity_info.html      |  8 +++++++-
 apps/activity/templatetags/__init__.py        |  0
 apps/activity/templatetags/dict_get.py        | 12 ++++++++++++
 apps/activity/views.py                        | 19 +++++++++++++++++++
 apps/permission/fixtures/initial.json         | 16 ++++++++++++++++
 5 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 apps/activity/templatetags/__init__.py
 create mode 100644 apps/activity/templatetags/dict_get.py

diff --git a/apps/activity/templates/activity/includes/activity_info.html b/apps/activity/templates/activity/includes/activity_info.html
index f9ea634b..4565a086 100644
--- a/apps/activity/templates/activity/includes/activity_info.html
+++ b/apps/activity/templates/activity/includes/activity_info.html
@@ -1,7 +1,7 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load i18n perms pretty_money %}
+{% load i18n perms pretty_money dict_get %}
 {% url 'activity:activity_detail' activity.pk as activity_detail_url %}
 
 <div id="activity_info" class="card bg-light shadow mb-3">
@@ -53,6 +53,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <dt class="col-xl-6">{% trans 'opened'|capfirst %}</dt>
             <dd class="col-xl-6">{{ activity.open|yesno }}</dd>
         </dl>
+        {% if show_entries|dict_get:activity %}
+            <h2 class="text-center">
+                {{ entries_count|dict_get:activity }}
+                {% if entries_count|dict_get:activity >= 2 %}{% trans "entries" %}{% else %}{% trans "entry" %}{% endif %}
+            </h2>
+        {% endif %}
     </div>
 
     <div class="card-footer text-center">
diff --git a/apps/activity/templatetags/__init__.py b/apps/activity/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/activity/templatetags/dict_get.py b/apps/activity/templatetags/dict_get.py
new file mode 100644
index 00000000..e3e757c7
--- /dev/null
+++ b/apps/activity/templatetags/dict_get.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django import template
+
+
+def dict_get(d, key):
+    return d.get(key)
+
+
+register = template.Library()
+register.filter('dict_get', dict_get)
diff --git a/apps/activity/views.py b/apps/activity/views.py
index 3081c45b..9011f0e1 100644
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -93,6 +93,17 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
         started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
         context["started_activities"] = started_activities
 
+        entries_count = {}
+        show_entries = {}
+        for activity in started_activities:
+            if activity.activity_type.manage_entries:
+                entries = Entry.objects.filter(activity=activity)
+                entries_count[activity] = entries.count()
+
+                show_entries[activity] = True
+        context["entries_count"] = entries_count
+        context["show_entries"] = show_entries
+
         return context
 
 
@@ -137,6 +148,14 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix
                 "placeholder": ""
             }
         }
+        if self.object.activity_type.manage_entries:
+            entries = Entry.objects.filter(activity=self.object)
+            context["entries_count"] = {self.object: entries.count()}
+
+            context["show_entries"] = {self.object: timezone.now() > timezone.localtime(self.object.date_start)}
+        else:
+            context["entries_count"] = {self.object: 0}
+            context["show_entries"] = {self.object: False}
 
         return context
 
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index f3d4cf33..7946e66d 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -4430,6 +4430,22 @@
             "description": "Modifier le type de caution de mon inscription WEI tant qu'elle n'est pas validée"
         }
     },
+    {
+        "model": "permission.permission",
+        "pk": 298,
+        "fields": {
+            "model": [
+                "wei",
+                "bus"
+            ],
+            "query": "{\"pk\": [\"membership\", \"weimembership\", \"bus\", \"pk\"], \"wei__date_end__gte\": [\"today\"]}",
+            "type": "change",
+            "mask": 2,
+            "field": "information_json",
+            "permanent": false,
+            "description": "Modifier les informations du bus"
+        }
+    },
     {
         "model": "permission.permission",
         "pk": 311,