Eine Menge Aufräumarbeiten.
* Eine Testsuite um Mahrjong Ranking Berechnungen zu testen * Erste Arbeiten um die Workarounds aus dem "utils" Paket los zu werden. * Vieles am Code umformatiert für PEP8 conformität
This commit is contained in:
@@ -6,11 +6,9 @@ Created on 04.10.2011
|
||||
@author: christian
|
||||
"""
|
||||
from django.contrib.auth import get_user_model
|
||||
import django.forms
|
||||
from django.utils import timezone
|
||||
from django import forms
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from utils.html5 import forms
|
||||
from . import models
|
||||
|
||||
USER_MODEL = get_user_model()
|
||||
@@ -19,7 +17,7 @@ USER_MODEL = get_user_model()
|
||||
class HanchanForm(forms.ModelForm):
|
||||
error_css_class = 'error'
|
||||
required_css_class = 'required'
|
||||
start = forms.DateTimeField(label=_('start'), required=True)
|
||||
start = forms.SplitDateTimeField(label=_('start'), required=True)
|
||||
|
||||
class Meta(object):
|
||||
model = models.Hanchan
|
||||
@@ -29,8 +27,9 @@ class HanchanForm(forms.ModelForm):
|
||||
'player3', 'player3_input_score',
|
||||
'player4', 'player4_input_score',
|
||||
'comment')
|
||||
widgets = {'event': forms.HiddenInput(),
|
||||
'comment': forms.widgets.Textarea(attrs={'rows': 4, 'cols': 40})
|
||||
widgets = {
|
||||
'event': forms.HiddenInput(),
|
||||
'comment': forms.widgets.Textarea(attrs={'rows': 4, 'cols': 40})
|
||||
}
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
@@ -45,7 +44,6 @@ class HanchanForm(forms.ModelForm):
|
||||
self.fields[player].queryset = player_queryset
|
||||
|
||||
|
||||
|
||||
class HanchanAdminForm(HanchanForm):
|
||||
|
||||
class Meta(object):
|
||||
@@ -53,12 +51,12 @@ class HanchanAdminForm(HanchanForm):
|
||||
fields = HanchanForm.Meta.fields + ('confirmed',)
|
||||
|
||||
|
||||
class SeasonSelectForm(django.forms.Form):
|
||||
season = django.forms.ChoiceField(label='', choices=('a', 'b', 'c'))
|
||||
class SeasonSelectForm(forms.Form):
|
||||
season = forms.ChoiceField(label='', choices=('a', 'b', 'c'))
|
||||
|
||||
def __init__(self, user, *args, **kwargs):
|
||||
super(SeasonSelectForm, self).__init__(args, kwargs)
|
||||
season_list = models.LadderRanking.objects.filter(user=user)
|
||||
season_list = season_list.select_related('user')
|
||||
season_list = season_list.values_list('season__id', 'season__name')
|
||||
self.fields['season'] = django.forms.ChoiceField(choices=season_list)
|
||||
self.fields['season'] = forms.ChoiceField(choices=season_list)
|
||||
|
||||
Reference in New Issue
Block a user