mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Merge branch 'stable' of 195.113.26.193:/akce/MaM/MaMweb/mamweb into stable

Browse source
This commit is contained in:
Bc. Petr Pecha 2017-01-20 21:11:36 +01:00
commit 410d89bb83
3 changed files with 45 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
korektury/views.py
View file

@ -181,11 +181,14 @@ class KorekturyView(generic.TemplateView):
o.komentare = o.komentar_set.all() o.komentare = o.komentar_set.all()
for k in o.komentare: for k in o.komentare:
if k.autor in zasluhy: if k.autor in zasluhy:
zasluhy[k.autor]+=1 zasluhy[k.autor] += 1
else: else:
zasluhy[k.autor]=1 zasluhy[k.autor] = 1
zasluhy = [{'autor':jmeno, 'pocet':pocet} for (jmeno,pocet) in zasluhy.items()] zasluhy = [
zasluhy.sort(key=lambda z:z['pocet'],reverse=True) {'autor': jmeno, 'pocet': pocet}
for (jmeno, pocet) in zasluhy.items()
]
zasluhy.sort(key=lambda z: z['pocet'], reverse=True)
strany = set(o.strana for o in opravy) strany = set(o.strana for o in opravy)
opravy_na_stranu = [{'strana': s, 'op_id': opravy.filter(strana=s)} for s in strany] opravy_na_stranu = [{'strana': s, 'op_id': opravy.filter(strana=s)} for s in strany]

10
seminar/urls.py
View file

@ -72,10 +72,16 @@ urlpatterns = [
staff_member_required(views.soustredeniObalkyView), name='seminar_soustredeni_obalky'), staff_member_required(views.soustredeniObalkyView), name='seminar_soustredeni_obalky'),
url(r'^tex-upload/login/$', views.LoginView, name='seminar_login'), url(r'^tex-upload/login/$', views.LoginView, name='seminar_login'),
url(r'^tex-upload/$', staff_member_required(views.texUploadView), name='seminar_tex_upload'), url(
r'^tex-upload/$',
staff_member_required(views.texUploadView),
name='seminar_tex_upload'
),
# Ceka na autocomplete v3 # Ceka na autocomplete v3
#url(r'^autocomplete/organizatori/$', staff_member_required(views.OrganizatorAutocomplete.as_view()), name='seminar_autocomplete_organizator') # url(r'^autocomplete/organizatori/$',
# staff_member_required(views.OrganizatorAutocomplete.as_view()),
# name='seminar_autocomplete_organizator')
] ]

54
seminar/views.py
View file

@ -122,26 +122,31 @@ class StareNovinkyView(generic.ListView):
### Co je M&M ### Co je M&M
## Organizatori
# Organizatori
def aktivniOrganizatori(rok=date.today().year): def aktivniOrganizatori(rok=date.today().year):
return Organizator.objects.exclude( return Organizator.objects.exclude(
organizuje_do_roku__isnull=False, organizuje_do_roku__isnull=False,
organizuje_do_roku__lt=rok organizuje_do_roku__lt=rok
).order_by('user__first_name') ).order_by('user__first_name')
class CojemamOrganizatoriView(generic.ListView): class CojemamOrganizatoriView(generic.ListView):
model = Organizator model = Organizator
template_name='seminar/cojemam/organizatori.html' template_name = 'seminar/cojemam/organizatori.html'
queryset = aktivniOrganizatori() queryset = aktivniOrganizatori()
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs) context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
context['aktivni'] = True context['aktivni'] = True
return context return context
class CojemamOrganizatoriStariView(generic.ListView): class CojemamOrganizatoriStariView(generic.ListView):
model = Organizator model = Organizator
template_name='seminar/cojemam/organizatori.html' template_name = 'seminar/cojemam/organizatori.html'
queryset = Organizator.objects.exclude(id__in = aktivniOrganizatori()).order_by('-organizuje_do_roku') queryset = Organizator.objects.exclude(
id__in=aktivniOrganizatori()).order_by('-organizuje_do_roku')
### Archiv ### Archiv
@ -807,24 +812,23 @@ def texDownloadView(request, rocnik, cislo):
return JsonResponse(response) return JsonResponse(response)
# Ceka na autocomplete v3 # Ceka na autocomplete v3
#class OrganizatorAutocomplete(autocomplete.Select2QuerySetView): # class OrganizatorAutocomplete(autocomplete.Select2QuerySetView):
# def get_queryset(self): # def get_queryset(self):
# if not self.request.user.is_authenticated(): # if not self.request.user.is_authenticated():
# return Organizator.objects.none() # return Organizator.objects.none()
# #
# qs = aktivniOrganizatori() # qs = aktivniOrganizatori()
# #
# if self.q: # if self.q:
# if self.q[0] == "!": # if self.q[0] == "!":
# qs = Organizator.objects.all() # qs = Organizator.objects.all()
# query = self.q[1:] # query = self.q[1:]
# else: # else:
# query = self.q # query = self.q
# qs = qs.filter( # qs = qs.filter(
# Q(prezdivka__isstartswith=query)| # Q(prezdivka__isstartswith=query)|
# Q(user__first_name__isstartswith=query)| # Q(user__first_name__isstartswith=query)|
# Q(user__last_name__isstartswith=query)) # Q(user__last_name__isstartswith=query))
# #
# return qs # return qs