Fehlerbereinigung.

Mahjong Ranking berechnet nun die richtigen Ränge zu den legendären Kyu/Dan Punkten.

Stablie Version bevor die Datenstruktur des Mahjongrankings vereinfacht wird.
This commit is contained in:
Christian Berg
2015-08-18 20:25:35 +02:00
committed by Christian Berg
parent bafbf38612
commit 79eaeb34ad
1172 changed files with 1713 additions and 10150 deletions

View File

@@ -5,6 +5,7 @@ from datetime import timedelta
from django.contrib.auth.decorators import permission_required
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from extra_views import ModelFormSetView, InlineFormSetView
from django.http import HttpResponse, Http404
from django.shortcuts import redirect
from django.utils import timezone
@@ -93,6 +94,7 @@ class EventDetailMixin(object):
class EventForm(PermissionRequiredMixin, generic.UpdateView):
form_class = forms.EventForm
template_name = 'events/event_form.html'
permission_required = 'events.add_event'
def get_context_data(self, **kwargs):
@@ -110,15 +112,28 @@ class EventForm(PermissionRequiredMixin, generic.UpdateView):
@param queryset:
"""
if self.kwargs.get('pk'):
event = models.Event.objects.get(pk=self.kwargs['pk'])
if event.event_series:
return event.event_series
else:
return event
return models.Event.objects.get(pk=self.kwargs['pk'])
else:
return models.Event()
class EventSeriesForm(EventDetailMixin, PermissionRequiredMixin, InlineFormSetView):
model = models.Event
inline_model = models.Event
fk_name = 'event_series'
fields = ('start', 'end')
form_class = forms.EventForm
extra = 3
permission_required = 'events.add_event'
template_name = 'events/eventseries_form.html'
def get_object(self, queryset=None):
self.event = models.Event.objects.get(pk=self.kwargs['pk'])
if self.event.event_series:
self.event = self.event.event_series
return self.event
class EventGallery(generic.ListView):
template_name = 'events/photo_gallery.html'
queryset = models.Event.objects.filter(start__lt=timezone.now(),