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

Dokonceni generovani titulu, bugfixy

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2015-11-15 17:06:50 +01:00
parent 358ecaa1e3
commit a40488a4c8
3 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
seminar/templates/seminar/archiv/Tituly.tex
View file

9
seminar/templates/seminar/archiv/tituly.tex Normal file
View file

@ -0,0 +1,9 @@
{% autoescape off %}
{% load tex %}
{% for r in resitele %}
{% spaceless %}
\def\{{r.ascii}}{\titul{{r.titul|sloz}}\relax}
{% endspaceless %}
{% endfor %}
{% endautoescape %}

31
seminar/views.py
View file

@ -19,7 +19,7 @@ import subprocess
import shutil import shutil
import os import os
from django.conf import settings from django.conf import settings
import unicodedata
def verejna_temata(rocnik): def verejna_temata(rocnik):
"""Vrací queryset zveřejněných témat v daném ročníku. """Vrací queryset zveřejněných témat v daném ročníku.
@ -350,13 +350,15 @@ def cisloObalkyView(request,rocnik,cislo):
letos = CisloObalkyStruct() letos = CisloObalkyStruct()
loni = CisloObalkyStruct() loni = CisloObalkyStruct()
letos.rocnik = Rocnik.objects.filter(rocnik = rocnik) letos.rocnik = Rocnik.objects.filter(rocnik = rocnik)[0]
loni.rocnik = Rocnik.objects.filter(rocnik = int(rocnik)-1) loni.rocnik = Rocnik.objects.filter(rocnik = int(rocnik)-1)[0]
letos.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=letos.rocnik,cislo__lte = cislo)) letos.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=letos.rocnik,cislo__lte = cislo))
loni.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=loni.rocnik)) loni.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=loni.rocnik))
letos.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=letos.problemy)).distinct() letos.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=letos.problemy)).distinct()
loni.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=loni.problemy)).distinct() loni.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=loni.problemy)).distinct()
loni.resitele = loni.resitele.filter(rok_maturity__gt = letos.rocnik.prvni_rok)
if int(cislo) > 3: if int(cislo) > 3:
resitele = letos.resitele resitele = letos.resitele
else: else:
@ -383,17 +385,20 @@ def obalkyView(request,resitele):
### Tituly ### Tituly
def TitulyView(request, rocnik, cislo): def TitulyView(request, rocnik, cislo):
resitele = Resitel.objects.all() rocnik_obj = Rocnik.objects.filter(rocnik = rocnik).first()
for resitel in resitele: resitele = Resitel.objects.filter(rok_maturity__gte = rocnik_obj.prvni_rok)
rocnik_obj = Rocnik.objects.filter(rocnik = rocnik) cislo_obj = Cislo.objects.filter(rocnik = rocnik_obj, cislo = cislo).first()
cislo_obj = Cislo.objects.filter(rocnik = rocnik_obj, cislo = cislo).first()
body = VysledkyKCisluOdjakziva.objects.filter(resitel = resitel, cislo = cislo_obj).first().body
resitel.titul = resitel.get_titul(body)
return render(request, 'seminar/archiv/Tituly.tex', for resitel in resitele:
{'resitele': resitele, vys = VysledkyKCisluOdjakziva.objects.filter(resitel = resitele, cislo = cislo_obj).first()
} if vys == None:
) body = 0
else:
body = vys.body
resitel.titul = resitel.get_titul(body)
resitel.ascii = unicodedata.normalize('NFKD',resitel.jmeno+resitel.prijmeni).encode("ascii","ignore").replace(" ","")
return render(request, 'seminar/archiv/tituly.tex',{'resitele': resitele})
### Soustredeni ### Soustredeni