xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Fixed Hanchan count and filter from last merge.

Browse Source
This commit is contained in:
Christian Berg
2017-11-24 19:47:28 +01:00
parent d62f549a30
commit 52ec7d42b7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mahjong_ranking/managers.py
View File

@@ -23,8 +23,8 @@ class HanchanManager(models.Manager):
:return: QuerySet Object :return: QuerySet Object
""" """
if user: if user:
return self.user_hanchans(user, confirmed=True, until=until, return self.user_hanchans(
**filter_args) user, confirmed=True, since=since, until=until, **filter_args)
hanchans = self.filter(confirmed=True, **filter_args) hanchans = self.filter(confirmed=True, **filter_args)
if since: if since:
hanchans = hanchans.filter(start__gt=since) hanchans = hanchans.filter(start__gt=since)
@@ -101,7 +101,7 @@ class HanchanManager(models.Manager):
) )
queryset = queryset.filter(**filter_args) queryset = queryset.filter(**filter_args)
if since: if since:
queryset = queryset.filter(start__gte=since) queryset = queryset.filter(start__gt=since)
if until: if until:
queryset = queryset.filter(start__lte=until) queryset = queryset.filter(start__lte=until)
queryset = queryset.select_related().order_by('-start') queryset = queryset.select_related().order_by('-start')

7
src/mahjong_ranking/models.py
View File

@@ -475,6 +475,11 @@ class KyuDanRanking(models.Model):
"recalculating Kyu/Dan points for %(user)s since %(since)s...", "recalculating Kyu/Dan points for %(user)s since %(since)s...",
{'user': self.user, 'since': str(since)} {'user': self.user, 'since': str(since)}
) )
if since:
valid_hanchans = valid_hanchans.filter(start__gt=since)
if until:
valid_hanchans = valid_hanchans.filter(start__lte=until)
self.hanchan_count += valid_hanchans.count() self.hanchan_count += valid_hanchans.count()
for hanchan in valid_hanchans: for hanchan in valid_hanchans:
hanchan.get_playerdata(self.user) hanchan.get_playerdata(self.user)
@@ -583,7 +588,7 @@ class KyuDanRanking(models.Model):
self.kyu = 10 self.kyu = 10
elif self.kyu_points > 50: elif self.kyu_points > 50:
self.dan = 1 self.dan = 1
self.kyu = None self.kyu = 0
self.dan_points = 0 self.dan_points = 0
self.kyu_points = 0 self.kyu_points = 0
else: else: