From 625ae810efba0fc730d2b4cade0b50f6a707cd49 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Thu, 26 Nov 2020 02:57:37 +0100 Subject: [PATCH] =?UTF-8?q?Stejn=C3=A1=20=C3=BAprava=20v=C3=BDsledkovky=20?= =?UTF-8?q?ro=C4=8Dn=C3=ADku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P. --- seminar/templates/seminar/archiv/rocnik_vysledkovka.tex | 2 +- seminar/views.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/rocnik_vysledkovka.tex b/seminar/templates/seminar/archiv/rocnik_vysledkovka.tex index 75d8eb79..925db3b1 100644 --- a/seminar/templates/seminar/archiv/rocnik_vysledkovka.tex +++ b/seminar/templates/seminar/archiv/rocnik_vysledkovka.tex @@ -7,7 +7,7 @@ \endhead \hline \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} {% endwith %} {% endwith %} diff --git a/seminar/views.py b/seminar/views.py index 5d52e79c..dd9c0aff 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -309,6 +309,7 @@ def vysledkovka_rocniku(rocnik, jen_verejne=True): v.body_odjakziva = verejne_vysl_odjakziva.filter(resitel = v.resitel)[0].body 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_cisla = []