diff --git a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex index 71e8acce..7ff629d8 100644 --- a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex +++ b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex @@ -4,6 +4,6 @@ \endhead \hline \endfoot -{% for rv in vysledkovka %}{{rv.poradi}}&{% if rv.titul %}\titul{ {{ rv.titul}}}{% endif %}{{rv.resitel.inicial_krestni}} {{rv.resitel.prijmeni}}&{{rv.resitel.rocnik|default:""}}&{{rv.body_celkem_odjakziva}}&{% for b in rv.body_ulohy %}{{b}}&{% endfor %}{{rv.body_cislo}}&{{rv.body_celkem_rocnik|default:0}}\\ +{% for rv in vysledkovka %}{{rv.poradi}}&\{{rv.titulmakro}}{}{{rv.resitel.inicial_krestni}} {{rv.resitel.prijmeni}}&{{rv.resitel.rocnik|default:""}}&{{rv.body_celkem_odjakziva}}&{% for b in rv.body_ulohy %}{{b}}&{% endfor %}{{rv.body_cislo}}&{{rv.body_celkem_rocnik|default:0}}\\ {% endfor %} \end{longtable} diff --git a/seminar/views.py b/seminar/views.py index 1ab5460a..5d52e79c 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -480,6 +480,7 @@ class CisloView(generic.DetailView): v.body_ulohy = [''] * len(problemy) v.titul = v.resitel.get_titul(v.body_celkem_odjakziva) + v.titulmakro = unicodedata.normalize('NFKD',v.resitel.jmeno+v.resitel.prijmeni).encode("ascii","ignore").replace(" ","") body_cislo_q = VysledkyZaCislo.objects.filter(resitel=v.resitel, cislo=context['cislo']) v.body_cislo = body_cislo_q[0].body if body_cislo_q else 0