Merge pull request #1227 from gtech-mulearn/dev-server

cp issue
gtech-mulearn · Oct 7, 2023 · 973936f · 973936f
2 parents 43149a7 + 4a3935b
commit 973936f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/api/dashboard/campus/campus_views.py b/api/dashboard/campus/campus_views.py
@@ -1,6 +1,4 @@
 from django.db.models import Count, Q, F, Case, When, Value
-from django.db.models import Sum
-from django.db.models.functions import Coalesce
 from rest_framework.views import APIView
 
 from db.task import Level, Wallet
@@ -120,7 +118,8 @@ def get(self, request):
                 level=F("user_lvl_link_user__level__name"),
                 join_date=F("created_at"),
                 is_active=Case(
-                    When(Q(karma_activity_log_user__created_at__range=(start_date, end_date)), then=Value("Active")),
+                    When(Q(karma_activity_log_user__created_at__range=(start_date, end_date),
+                           karma_activity_log_user__user=F("id")), then=Value("Active")),
                     default=Value("Not Active")
                 )
             ))