Fehler bei Vergabe von Bonuspunkte korrigiert.
Kommentare für Bonuspunkte werden jetzt als Kommentar beim Spieler hinterlassen, nicht als Kommentar in der Hanchan. FIXED: 3_in_a_row counter wurde nicht zurückgesetzt wenn Bonuspunkte vergeben wurden. FIXED: Durchschnittliche Platzierung während eines Events wurde nur als Ganzzahl berechnet. Wird nun als Fießkomma berechnet und gesichert.
This commit is contained in:
@@ -23,45 +23,33 @@ class HanchanForm(forms.ModelForm):
|
||||
|
||||
class Meta(object):
|
||||
model = models.Hanchan
|
||||
fields = ( 'start',
|
||||
'player1', 'player1_input_score',
|
||||
'player2', 'player2_input_score',
|
||||
'player3', 'player3_input_score',
|
||||
'player4', 'player4_input_score',
|
||||
fields = ('start',
|
||||
'player1', 'player1_input_score', # 'player1_comment',
|
||||
'player2', 'player2_input_score', # 'player2_comment',
|
||||
'player3', 'player3_input_score', # 'player3_comment',
|
||||
'player4', 'player4_input_score', # 'player4_comment',
|
||||
'comment')
|
||||
widgets = {'event': forms.HiddenInput(),
|
||||
'comment': forms.widgets.Textarea(attrs={'rows': 4, 'cols': 40})
|
||||
}
|
||||
}
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(HanchanForm, self).__init__(*args, **kwargs)
|
||||
# self.fields['event'].widget.attrs['disabled'] = True
|
||||
for i in xrange(1, 4):
|
||||
self.fields['player%d_input_score' % i].widget.attrs['size'] = 6
|
||||
self.fields['player%d_input_score' % i].widget.attrs['type'] = 'number'
|
||||
player_input_score = 'player%d_input_score' % i
|
||||
self.fields[player_input_score].widget.attrs['size'] = 6
|
||||
self.fields[player_input_score].widget.attrs['type'] = 'number'
|
||||
|
||||
|
||||
'''
|
||||
def clean_start(self):
|
||||
u"""Das Datum darf nicht in der Zukunft liegen und es muss innerhalb
|
||||
der Dauer des Events liegen."""
|
||||
start = self.cleaned_data['start']
|
||||
event = self.cleaned_data['event']
|
||||
if start > timezone.now():
|
||||
raise django.forms.ValidationError(
|
||||
_("It's not allowed to enter future games."))
|
||||
if not event.start <= start <= event.end:
|
||||
raise django.forms.ValidationError(
|
||||
_("Only games running during this event are allowed."))
|
||||
return start
|
||||
'''
|
||||
|
||||
class HanchanAdminForm(HanchanForm):
|
||||
|
||||
class Meta(object):
|
||||
model = models.Hanchan
|
||||
fields = HanchanForm.Meta.fields + ('confirmed',)
|
||||
|
||||
|
||||
|
||||
class SeasonSelectForm(django.forms.Form):
|
||||
season = django.forms.ChoiceField(label='', choices=('a', 'b', 'c'))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user