Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev server #2099

Merged
merged 17 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6ece244
refactor: Add "Community" as an allowed organization type in Leaderbo…
jelanmathewjames Jun 20, 2024
b0b58d5
Merge branch 'dev' of https://github.com/jelanmathewjames/mulearnback…
jelanmathewjames Jun 20, 2024
74c0f32
refactor: Update launchpad serializer
jelanmathewjames Jun 20, 2024
2e57e00
Merge branch 'gtech-mulearn:dev' into dev
jelanmathewjames Jun 20, 2024
62e0a0b
Merge pull request #2093 from jelanmathewjames/dev
jelanmathewjames Jun 20, 2024
b0b13e7
Merge pull request #2094 from gtech-mulearn/dev
jelanmathewjames Jun 20, 2024
46abdd8
refactor: Update Launchpad Leaderboard APIView
jelanmathewjames Jun 20, 2024
5c02a91
Merge branch 'dev' of https://github.com/jelanmathewjames/mulearnback…
jelanmathewjames Jun 20, 2024
2b26493
Merge branch 'gtech-mulearn:dev' into dev
jelanmathewjames Jun 20, 2024
8f71993
Merge pull request #2095 from jelanmathewjames/dev
jelanmathewjames Jun 20, 2024
464311d
Merge pull request #2096 from gtech-mulearn/dev
jelanmathewjames Jun 20, 2024
d0c7ce1
refactor: Update ListParticipantsAPI
jelanmathewjames Jun 20, 2024
1836ad1
Merge branch 'dev' of https://github.com/jelanmathewjames/mulearnback…
jelanmathewjames Jun 20, 2024
31f28a4
refactor: Update LaunchpadParticipantsSerializer to allow null and bl…
jelanmathewjames Jun 20, 2024
6e7be71
Merge branch 'gtech-mulearn:dev' into dev
jelanmathewjames Jun 20, 2024
e2411c3
Merge pull request #2097 from jelanmathewjames/dev
jelanmathewjames Jun 20, 2024
0922337
Merge pull request #2098 from gtech-mulearn/dev
jelanmathewjames Jun 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/launchpad/launchpad_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ def get(self, request):
queryset=UserRoleLink.objects.filter(verified=True, role__title__in=allowed_levels).select_related('role')
)
).filter(
user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
org__org_type__in=allowed_org_types
).values("id")
).values("id")) | Q(user_organization_link_user__id__isnull=True)
).annotate(
org=F("user_organization_link_user__org__title"),
district_name=F("user_organization_link_user__org__district__name"),
Expand Down
6 changes: 3 additions & 3 deletions api/launchpad/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ def get_rank(self, obj):


class LaunchpadParticipantsSerializer(serializers.ModelSerializer):
org = serializers.CharField()
district_name = serializers.CharField()
state = serializers.CharField()
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()

class Meta:
Expand Down
Loading