diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py index 8a9527ca..d36740a2 100644 --- 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 index 92386593..0fe5bdf5 100644 --- 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