From 05b07c27036f5058e5cfcaa93ed23dd6c3dc00b1 Mon Sep 17 00:00:00 2001 From: y938 Date: Mon, 1 Apr 2024 14:09:00 +0300 Subject: [PATCH] minor changes --- accounts/models.py | 21 +++++++++------------ core/views.py | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/accounts/models.py b/accounts/models.py index c4196e8..478f75d 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -54,6 +54,15 @@ class CustomUserManager(UserManager): ).distinct() # distinct() is often necessary with Q lookups return queryset + def get_student_count(self): + return self.model.objects.filter(is_student=True).count() + + def get_lecturer_count(self): + return self.model.objects.filter(is_lecturer=True).count() + + def get_superuser_count(self): + return self.model.objects.filter(is_superuser=True).count() + GENDERS = (("M", "Male"), ("F", "Female")) @@ -85,18 +94,6 @@ class User(AbstractUser): full_name = self.first_name + " " + self.last_name return full_name - @classmethod - def get_student_count(cls): - return cls.objects.filter(is_student=True).count() - - @classmethod - def get_lecturer_count(cls): - return cls.objects.filter(is_lecturer=True).count() - - @classmethod - def get_superuser_count(cls): - return cls.objects.filter(is_superuser=True).count() - def __str__(self): return "{} ({})".format(self.username, self.get_full_name) diff --git a/core/views.py b/core/views.py index e3af724..5858148 100644 --- a/core/views.py +++ b/core/views.py @@ -27,9 +27,9 @@ def dashboard_view(request): logs = ActivityLog.objects.all().order_by("-created_at")[:10] gender_count = Student.get_gender_count() context = { - "student_count": User.get_student_count(), - "lecturer_count": User.get_lecturer_count(), - "superuser_count": User.get_superuser_count(), + "student_count": User.objects.get_student_count(), + "lecturer_count": User.objects.get_lecturer_count(), + "superuser_count": User.objects.get_superuser_count(), "males_count": gender_count["M"], "females_count": gender_count["F"], "logs": logs,