Skip to content

number of entries in leaderboard fixed #966

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.

Sign up for GitHub

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

Merged
Didayolo merged 2 commits into from
Jun 20, 2023
Merged

number of entries in leaderboard fixed #966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5ccd6
number of entries fixed
ihsaan-ullah Jun 19, 2023
8e83350
Remove print
Didayolo Jun 20, 2023
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
9 changes: 7 additions & 2 deletions src/apps/api/views/competitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,14 @@ def get_leaderboard(self, request, pk):
columns = [col for col in query['columns']]
submissions_keys = {}
for submission in query['submissions']:

# count number of entries/number of submissions for the owner of this submission for this phase
num_entries = Submission.objects.filter(owner__username=submission['owner'], phase=phase).count()
# count all submissions with no parent and count all parents without counting the children
num_entries = Submission.objects.filter(
Q(owner__username=submission['owner']) | Q(parent__owner__username=submission['owner']),
phase=phase,
).exclude(
parent__isnull=False
).count()

# get date of last submission by the owner of this submission for this phase
last_entry_date = Submission.objects.filter(owner__username=submission['owner'], phase=phase)\
Expand Down