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.

src/events/views.py

@@ -2,6 +2,7 @@
 # Create your views here.
 from datetime import timedelta
 
+from django.db.models import Q
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
@@ -13,22 +14,23 @@ from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext as _
 from django.views import generic
 from icalendar import Calendar, Event
-import pyexiv2
 
 from utils.mixins import PermissionRequiredMixin
+
 from . import models, forms
 
 
 class DeleteEventPhoto(generic.DeleteView):
     model = models.Photo
-    """
-    def get_object(self, queryset=None):
-        return models.Photo.objects.get(pk=self.kwargs['pk'])
-    """
 
     def get_success_url(self):
         return reverse('event-photo-list', args=[self.object.event.id])
 
+    def get_context_data(self, **kwargs):
+        context = super(DeleteEventPhoto, self).get_context_data()
+        context['event'] = self.object.event
+        return context
+
     @method_decorator(permission_required('events.delete_photo'))
     def dispatch(self, *args, **kwargs):
         return super(DeleteEventPhoto, self).dispatch(*args, **kwargs)
@@ -39,10 +41,9 @@ class EventArchiveIndex(generic.ArchiveIndexView):
     context_object_name = 'event_list'
     date_field = 'start'
     model = models.Event
-    queryset = model.objects.all()
+    ordering = ('-start', '-end')
     paginate_by = 15
 
-
     def get_context_data(self, **kwargs):
         context = generic.ArchiveIndexView.get_context_data(self, **kwargs)
         context['is_archive'] = True
@@ -53,6 +54,7 @@ class EventArchiveMonth(generic.MonthArchiveView):
     date_field = 'start'
     make_object_list = True
     model = models.Event
+    ordering = ('start', 'end')
     month_format = '%m'
     paginate_by = 15
     template_name = 'events/event_archive.html'
@@ -64,9 +66,10 @@ class EventArchiveMonth(generic.MonthArchiveView):
 
 
 class EventArchiveYear(generic.YearArchiveView):
+    model = models.Event
     date_field = 'start'
     make_object_list = True
-    model = models.Event
+    ordering = ('start', 'end')
     paginate_by = 15
     template_name = 'events/event_archive.html'
     year_format = '%Y'
@@ -117,27 +120,13 @@ class EventForm(PermissionRequiredMixin, generic.UpdateView):
             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(),
-                                           photo_count__gt=0)
+    queryset = models.Event.objects.filter(
+        start__lt=timezone.now(),
+        event_series__isnull=True,
+        photo_count__gt=0
+    )
     paginate_by = 12
 
 
@@ -180,7 +169,10 @@ class EventPhoto(generic.UpdateView):
 
     def get_context_data(self, **kwargs):
         context = super(EventPhoto, self).get_context_data()
-        event = models.Event.objects.get(id=self.kwargs['event'])
+        try:
+            event = models.Event.objects.get(id=self.kwargs['event'])
+        except models.Event.DoesNotExist:
+            event = self.object.event
         context['event'] = event
         return context
 
@@ -209,7 +201,10 @@ class EventPhotoList(generic.ListView):
     def get_queryset(self):
         try:
             self.event = models.Event.objects.get(id=self.kwargs['event'])
-            return models.Photo.objects.filter(event=self.event)
+            return models.Photo.objects.filter(
+                Q(event=self.event) |
+                Q(event__event_series=self.event)
+            )
         except models.Event.DoesNotExist:
             raise Http404(_('Event does not exist'))
 
@@ -261,20 +256,28 @@ class EventPhotoUpload(generic.FormView):
         return redirect('event-photo-list', event=self.event.id)
 
     def read_exif(self, photo):
-        exif_data = pyexiv2.ImageMetadata.from_buffer(photo.read())
-        exif_data.read()
-
-        try:
-            created_date = exif_data['Exif.Image.DateTime'].value
-        except:
-            created_date = self.event.start + timedelta(minutes=self.counter)
-        try:
-            description = exif_data['Exif.Image.ImageDescription'].value
-        except:
-            description = ''
+        created_date = self.event.start + timedelta(minutes=self.counter)
+        description = ''
         return created_date, description
 
 
+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 UpcomingEvents(generic.ListView):
     queryset = models.Event.objects.upcoming(limit=None)
     paginate_by = 16