xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Diverse Code Cleanups

Browse Source 
*Code wurde PEP-8 gerecht formatiert
* Kleine Fehler die der PyCharm Inspector beanstandet wurden korrigiert
This commit is contained in:
Christian Berg
2014-11-26 16:04:52 +01:00
committed by Christian Berg
parent f34281089d
commit 86a0db050d
76 changed files with 619 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mahjong_ranking/views.py
View File

@@ -1,18 +1,20 @@
# -*- encoding: utf-8 -*-
import urllib
from django.contrib import auth, messages
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, Http404
import django.forms
import django.http
from django.utils.translation import gettext as _
from django.views import generic
from events.models import Event
from mahjong_ranking import forms, models
from utils.mixins import LoginRequiredMixin, PermissionRequiredMixin
import django.forms
import xlwt
from django import http
import urllib
from events.models import Event
from . import forms, models
from membership.models import Membership
from utils.mixins import LoginRequiredMixin, PermissionRequiredMixin
kyu_dan_order = {
'+full_name': ('user__last_name', 'user__first_name'),
@@ -29,10 +31,10 @@ kyu_dan_order = {
class DeleteHanchan(PermissionRequiredMixin, generic.DeleteView):
'''
"""
Fragt zuerst nach, ob die Hanchan wirklich gelöscht werden soll.
Wir die Frage mit "Ja" beantwortet, wird die die Hanchan gelöscht.
'''
"""
form_class = forms.HanchanForm
model = models.Hanchan
permission_required = 'mahjong_ranking.delete_hanchan'
@@ -44,10 +46,10 @@ class DeleteHanchan(PermissionRequiredMixin, generic.DeleteView):
class HanchanForm(PermissionRequiredMixin, generic.UpdateView):
'''
"""
Ein Formular um eine neue Hanchan anzulegen, bzw. eine bestehende zu
bearbeitsen
'''
"""
form_class = forms.HanchanForm
model = models.Hanchan
permission_required = 'mahjong_ranking.add_hanchan'
@@ -60,7 +62,7 @@ class HanchanForm(PermissionRequiredMixin, generic.UpdateView):
else:
formset.save()
self.object = form.save()
return HttpResponseRedirect(self.get_success_url())
return django.http.HttpResponseRedirect(self.get_success_url())
def form_invalid(self, form, formset):
return self.render_to_response(self.get_context_data(
@@ -106,10 +108,10 @@ class HanchanForm(PermissionRequiredMixin, generic.UpdateView):
return context
def get(self, request, *args, **kwargs):
'''
"""
:param request:
'''
"""
self.object = self.get_object()
form = self.get_form(self.get_form_class())
formset = self.get_formset()
@@ -131,9 +133,9 @@ class HanchanForm(PermissionRequiredMixin, generic.UpdateView):
class EventHanchanList(generic.ListView):
'''
"""
Auflistung aller Hanchan die während der Veranstaltung gespielt wurden.
'''
"""
model = models.Hanchan
def get_queryset(self):
@@ -144,7 +146,7 @@ class EventHanchanList(generic.ListView):
queryset = queryset.order_by('start')
return queryset
except models.Event.DoesNotExist:
raise Http404(_('Event does not exist'))
raise django.http.Http404(_('Event does not exist'))
def get_context_data(self, **kwargs):
context = generic.ListView.get_context_data(self, **kwargs)
@@ -153,10 +155,10 @@ class EventHanchanList(generic.ListView):
class EventRankingList(generic.ListView):
'''
"""
Anzeige des Eventrankings, daß erstellt wurde falls der Termin als internes
Turnier markiert wurde.
'''
"""
model = models.EventRanking
def get_queryset(self):
@@ -166,7 +168,7 @@ class EventRankingList(generic.ListView):
queryset = queryset.prefetch_related()
return queryset
except models.Event.DoesNotExist:
raise Http404(_('Event does not exist'))
raise django.http.Http404(_('Event does not exist'))
def get_context_data(self, **kwargs):
context = generic.ListView.get_context_data(self, **kwargs)
@@ -175,10 +177,9 @@ class EventRankingList(generic.ListView):
class KyuDanRankingList(generic.ListView):
'''
"""
Anzeige aller Spiele mit ihrem Kyu bzw Dan Grad.
'''
models.KyuDanRanking
"""
default_order = '-score'
order_by = ''
paginate_by = 25
@@ -213,7 +214,7 @@ class LadderRankingList(generic.ListView):
else:
self.season = models.LadderSeason.objects.current()
except models.LadderSeason.DoesNotExist:
raise Http404(_('Season does not exist'))
raise django.http.Http404(_('Season does not exist'))
queryset = models.LadderRanking.objects.filter(season=self.season, placement__isnull=False).select_related()
return queryset
@@ -238,7 +239,7 @@ class LadderRankingExcel(generic.View):
def get(self, request, **kwargs):
self.queryset = self.team.members.all()
response = http.HttpResponse(mimetype=u'application/msexcel')
response = django.http.HttpResponse(mimetype=u'application/msexcel')
filename = urllib.quote(self.filename.encode('utf-8'))
response['Content-Disposition'] = "attachment; filename*=UTF-8''%s" % filename
@@ -277,12 +278,11 @@ class LadderRankingExcel(generic.View):
self.set_col(sheet, current_row, 9, profile.weight or None)
self.set_col(sheet, current_row, 10, profile.emergency_contact or None)
self.set_col(sheet, current_row, 11, profile.emergency_phone or None)
except models.MemberProfile.DoesNotExist:
except Membership.DoesNotExist:
pass
current_row += 1
for column in range(0, 13):
print column, self.max_colwidth[column]
sheet.col(column).width = (self.max_colwidth[column] + 1) * 256
workbook.save(response)
@@ -294,10 +294,10 @@ class PlayerScore(LoginRequiredMixin, generic.ListView):
def get(self, request, *args, **kwargs):
try:
self.user = auth.models.User.objects.get(username=self.kwargs.get('username'))
self.user = auth.get_user_model().objects.get(username=self.kwargs.get('username'))
self.membership = Membership.objects.get_or_create(user=self.user)[0]
except auth.models.User.DoesNotExist:
raise Http404(_("No user found matching the name %s") % self.kwargs.get('username'))
except auth.get_user_model().DoesNotExist:
raise django.http.Http404(_("No user found matching the name %s") % self.kwargs.get('username'))
return generic.ListView.get(self, request, *args, **kwargs)
def get_context_data(self, **kwargs):
@@ -305,13 +305,13 @@ class PlayerScore(LoginRequiredMixin, generic.ListView):
context['membership'] = self.membership
try:
context['kyu_dan_ranking'] = models.KyuDanRanking.objects.get(user=self.user)
except:
except models.KyuDanRanking.DoesNotExist:
context['ranking'] = None
try:
context['ladder_ranking'] = models.LadderRanking.objects.get(
user=self.user,
season=models.LadderSeason.objects.current())
except:
except models.LadderRanking.DoesNotExist:
context['ladder_ranking'] = models.LadderRanking(user=self.user)
return context
@@ -343,10 +343,8 @@ class PlayerLadderScore(PlayerScore):
def get_context_data(self, **kwargs):
context = PlayerScore.get_context_data(self, **kwargs)
season_list = models.LadderRanking.objects.filter(user=self.user).select_related('user')
season_list = season_list.values_list('id', 'season__name')
context['season'] = self.season
context['seasons_select_form'] = forms.SeasonSelectForm(user=self.user)
context['seasons_select_field'] = django.forms.ChoiceField(choices=season_list)