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

Stejná úprava výsledkovky ročníku

Browse source 
P.
This commit is contained in:
MaM Web user 2020-11-26 02:57:37 +01:00
parent 2b4d16afca
commit 625ae810ef
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
seminar/templates/seminar/archiv/rocnik_vysledkovka.tex
View file

@ -7,7 +7,7 @@
\endhead \endhead
\hline \hline
\endfoot \endfoot
{% for rv in vysledkovka.radky %}{{ rv.poradi }} & {% if rv.titul %}\titul{{ lb }}{{ rv.titul }}}~{% endif %}{{ rv.resitel.jmeno|slice:":1" }}.~{{ rv.resitel.prijmeni }} & {% if rv.resitel.rocnik %}{{ rv.resitel.rocnik }}.{% endif %} & {{ rv.body_odjakziva }} {% for b in rv.body_cisla %} & {{ b }}{% endfor %} & {{ rv.body_rocnik }} \\ {% for rv in vysledkovka.radky %}{{ rv.poradi }} & \{{rv.titulmakro}}{}{{ rv.resitel.jmeno|slice:":1" }}.~{{ rv.resitel.prijmeni }} & {% if rv.resitel.rocnik %}{{ rv.resitel.rocnik }}.{% endif %} & {{ rv.body_odjakziva }} {% for b in rv.body_cisla %} & {{ b }}{% endfor %} & {{ rv.body_rocnik }} \\
{% endfor %}\end{longtable} {% endfor %}\end{longtable}
{% endwith %} {% endwith %}
{% endwith %} {% endwith %}

1
seminar/views.py
View file

@ -309,6 +309,7 @@ def vysledkovka_rocniku(rocnik, jen_verejne=True):
v.body_odjakziva = verejne_vysl_odjakziva.filter(resitel = v.resitel)[0].body v.body_odjakziva = verejne_vysl_odjakziva.filter(resitel = v.resitel)[0].body
v.titul = v.resitel.get_titul(v.body_odjakziva) v.titul = v.resitel.get_titul(v.body_odjakziva)
v.titulmakro = unicodedata.normalize('NFKD',v.resitel.jmeno+v.resitel.prijmeni).encode("ascii","ignore").replace(" ","")
v.body_rocnik = v.body v.body_rocnik = v.body
v.body_cisla = [] v.body_cisla = []