Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fixed global leaderboard #939

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
fredfalcon merged 1 commit into from
Aug 27, 2022
Merged

fixed global leaderboard #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions website/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,12 +1139,13 @@ def get_leaderboard(self,month=None,year=None,api=False):
all user scores for specified month and year
'''

data = User.objects

if year and not month:
data = User.objects.filter(points__created__year=year)
data = data.filter(points__created__year=year)

if year and month:
data = User.objects.filter(
data = data.filter(
Q(points__created__year=year) &
Q(points__created__month=month)
)
Expand Down Expand Up @@ -1201,7 +1202,7 @@ def get_context_data(self, *args, **kwargs):

if self.request.user.is_authenticated:
context["wallet"] = Wallet.objects.get(user=self.request.user)
context["leaderboard"] = self.get_leaderboard(year=int(datetime.now().year))
context["leaderboard"] = self.get_leaderboard()
return context


Expand Down