Moved configuration to settings

This commit is contained in:
2017-11-13 21:02:12 +01:00
parent 638ec96c25
commit e6f2528a0e
3 changed files with 33 additions and 29 deletions

View File

@@ -1,33 +1,9 @@
# -*- encoding: utf-8 -*-
from django.core.cache import cache
from django.conf import settings
import logging
KYU_RANKS = (
(45, 1),
(40, 2),
(35, 3),
(30, 4),
(25, 5),
(20, 6),
(15, 7),
(10, 8),
(5, 9),
(0, 10),
)
DAN_RANKS = (
(80, 9),
(70, 8),
(60, 7),
(50, 6),
(40, 5),
(30, 4),
(20, 3),
(10, 2),
(0, 1),
)
DAN_RANKS_DICT = dict([(dan, points) for points, dan in DAN_RANKS])
MIN_HANCHANS_FOR_LADDER = 5
DAN_RANKS_DICT = dict([(dan, points) for points, dan in settings.DAN_RANKS])
LOGGER = logging.getLogger('kasu.mahjong_ranking')

View File

@@ -13,7 +13,7 @@ from django.utils import timezone
from django.utils.translation import ugettext as _
from events.models import Event
from . import KYU_RANKS, DAN_RANKS, DAN_RANKS_DICT, LOGGER, set_dirty
from . import DAN_RANKS_DICT, LOGGER, set_dirty
from . import managers
kyu_dan_rankings = set()
@@ -555,7 +555,7 @@ class KyuDanRanking(models.Model):
self.dan = 1
elif self.dan or self.dan_points > 0:
old_dan = self.dan
for min_points, dan_rank in DAN_RANKS:
for min_points, dan_rank in settings.DAN_RANKS:
if self.dan_points > min_points:
self.dan = dan_rank
break
@@ -570,7 +570,7 @@ class KyuDanRanking(models.Model):
self.dan_points = 0
self.kyu_points = 0
else:
for min_points, kyu_rank in KYU_RANKS:
for min_points, kyu_rank in settings.KYU_RANKS:
if self.kyu_points > min_points:
self.kyu = kyu_rank
break