Merge pull request #2104 from gtech-mulearn/dev

Merge dev to dev-server
gtech-mulearn · Jun 20, 2024 · 4d448c8 · 4d448c8
2 parents 1529abd + 0034b03
commit 4d448c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py
@@ -101,9 +101,7 @@ def get(self, request):
             district_name=F("user_organization_link_user__org__district__name"),
             state=F("user_organization_link_user__org__district__zone__state__name"),
             level=F("user_role_link_user__role__title"),
-            time_=Max("karma_activity_log_user__created_at"),
-        ).filter(
-            level__in=allowed_levels
+            time_=Max("karma_activity_log_user__created_at")
         ).distinct()
 
         paginated_queryset = CommonUtils.get_paginated_queryset(

diff --git a/api/launchpad/serializers.py b/api/launchpad/serializers.py
@@ -72,7 +72,7 @@ class LaunchpadParticipantsSerializer(serializers.ModelSerializer):
     org = serializers.CharField(allow_null=True, allow_blank=True)
     district_name = serializers.CharField(allow_null=True, allow_blank=True)
     state = serializers.CharField(allow_null=True, allow_blank=True)
-    level = serializers.CharField()
+    level = serializers.CharField(allow_null=True, allow_blank=True)
 
     class Meta:
         model = User