From f969c83bca5dfa2b101cf2c383bcba468f53c16f Mon Sep 17 00:00:00 2001
From: Dorian Lesbre <dorian.lesbre@gmail.com>
Date: Thu, 18 Mar 2021 10:51:12 +0100
Subject: [PATCH] More metrics
---
home/templates/admin.html | 24 ++++++++++++++++++------
home/views.py | 8 ++++++++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/home/templates/admin.html b/home/templates/admin.html
index a2b895d..00b8530 100644
--- a/home/templates/admin.html
+++ b/home/templates/admin.html
@@ -52,6 +52,10 @@
<div class="qty">Non inscrits</div>
<div class="nb_small">{{ metrics.non_registered }}</div>
</div>
+ <div class="stat">
+ <div class="qty">Dormeurs</div>
+ <div class="nb_small">{{ metrics.sleeps }}</div>
+ </div>
</div>
<div class="flex wrap lines">
@@ -86,13 +90,21 @@
</div>
<div class="flex wrap lines">
- <!--<div class="stat">
- <div class="qty">Tasses</div>
- <div class="nb_small">{{ metrics.mugs }}</div>
- </div>-->
<div class="stat">
- <div class="qty">Dormeurs</div>
- <div class="nb_small">{{ metrics.sleeps }}</div>
+ <div class="qty">Activités</div>
+ <div class="nb_big">{{ metrics.activites }}</div>
+ </div>
+ <div class="stat">
+ <div class="qty">Sur inscription</div>
+ <div class="nb_small">{{ metrics.act_ins }}</div>
+ </div>
+ <div class="stat">
+ <div class="qty">Souhaits</div>
+ <div class="nb_small">{{ metrics.wish }}</div>
+ </div>
+ <div class="stat">
+ <div class="qty">Obtenus</div>
+ <div class="nb_small">{{ metrics.granted }}</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
diff --git a/home/views.py b/home/views.py
index d95a447..30d081f 100644
--- a/home/views.py
+++ b/home/views.py
@@ -138,6 +138,8 @@ class AdminView(SuperuserRequiredMixin, TemplateView):
def get_metrics(self):
registered = InterludesParticipant.objects.filter(is_registered = True)
+ acts = InterludesActivity.objects.all()
+ wishes = ActivityList.objects.filter(participant__is_registered=True)
class metrics:
participants = registered.count()
ulm = registered.filter(school="U").count()
@@ -156,6 +158,12 @@ class AdminView(SuperuserRequiredMixin, TemplateView):
# mugs = registered.filter(mug=True).count()
sleeps = registered.filter(sleeps=True).count()
+
+ activites = acts.count()
+ act_ins = acts.filter(must_subscribe=True).count()
+ wish = wishes.count()
+ granted = wishes.filter(accepted=True).count()
+
return metrics
def get_context_data(self, *args, **kwargs):
--
GitLab