From d289d165ef45f7c77076d7bd646e2409303eea65 Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Thu, 3 Dec 2015 01:05:06 +0100
Subject: [PATCH] =?UTF-8?q?Oprava=20generov=C3=A1n=C3=AD=20TeXovsk=C3=A9?=
=?UTF-8?q?=20v=C3=BDsledkovky.=20V=20models=20p=C5=99id=C3=A1na=20fce=20p?=
=?UTF-8?q?ro=20=C5=99e=C5=A1itele=20inicial=5Fkrestni,=20ve=20views.py=20?=
=?UTF-8?q?opraveno=20po=C5=99ad=C3=AD=20(2.-5.)=20pomoc=C3=AD=20unicodov?=
=?UTF-8?q?=C3=A9=20poml=C4=8Dky.=20A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
seminar/models.py | 3 ++
.../seminar/archiv/cislo_vysledkovka.tex | 35 +++----------------
seminar/views.py | 3 +-
3 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/seminar/models.py b/seminar/models.py
index c33488f1..fbb2a9d5 100644
--- a/seminar/models.py
+++ b/seminar/models.py
@@ -185,6 +185,9 @@ class Resitel(SeminarModelBase):
def plne_jmeno(self):
return force_unicode(u'%s %s' % (self.jmeno, self.prijmeni))
+ def inicial_krestni(self):
+ return force_unicode(u'%s.' % (self.jmeno[0]))
+
def __str__(self):
return force_unicode(self.plne_jmeno())
diff --git a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex
index e988484c..f3a9d662 100644
--- a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex
+++ b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex
@@ -1,33 +1,6 @@
-\begin{longtable}{r|l|c|l|c
- {% for p in problemy %}
- @\hskip.5em}c {% endfor %}
- |c|r|r}
-\hline
-& & & & \multicolumn{ {{ problemy|length }} }{c|}{\textbf{Úlohy}} & & \\
-\textbf{Poř.} & \textbf{Jméno} & \textbf{R.} & \raisebox{0.7mm}{$\sum_{-1}$} &
-{% for p in problemy %}
- {% if p.TYP_ULOHA %}
- \textbf{ r{{ p.kod }} } &
- {% else %}
- \textbf{ t{{ p.kod }} } &
- {% endif %}
-{% endfor %}
-\raisebox{0.7mm}{$\sum_0$} &
-\raisebox{0.7mm}{$\sum_1$} \\
-\hline
+\begin{longtable}{|r|l|c|r|{% for p in problemy %}c@{\hskip.5em}{% endfor %}|r|r|}\hline
+& & & & \multicolumn{ {{ problemy|length }} }{c|}{\textbf{Úlohy}} & & \\\textbf{Poř.} & \textbf{Jméno} & \textbf{R.} & \raisebox{0.7mm}{$\sum_{-1}$} & {% for p in problemy %}{% if p.TYP_ULOHA %}\textbf{r{{p.kod}}} & {% else %}\textbf{t{{p.kod}}} & {% endif %}{% endfor %}\raisebox{0.7mm}{$\sum_0$} & \raisebox{0.7mm}{$\sum_1$} \\ \hline
\endhead
\hline
-\endfoot
-
-{% for rv in vysledkovka %}
- {{ rv.poradi }} &
-{% if rv.resitel.titul %}
- \titul{ {{ rv.titul }} }
-{% endif %}
- {{ rv.resitel.plne_jmeno }} & {{ rv.resitel.rocnik |default:"" }} & {{ rv.body_minule }}
- {% for b in rv.body %}
- {{ b }} &
- {% endfor %}
- {{ rv.body_celkem_rocnik |default:0 }} & {{ rv.body_celkem_minule }} \\
-{% endfor %}
-\end{longtable}
+\endfoot {% for rv in vysledkovka %} {{ rv.poradi }} & {% if rv.resitel.titul %} \titul{ {{ rv.titul }} } {% endif %} {{rv.resitel.inicial_krestni}} {{rv.resitel.prijmeni}} & {{ rv.resitel.rocnik |default:"" }} & {{ rv.body_minule }} & {% for b in rv.body_ulohy %}{{ b }} & {% endfor %} {{ rv.body_celkem_rocnik |default:0 }} & {{ rv.body_celkem_minule }} \\
+{% endfor %}\end{longtable}
diff --git a/seminar/views.py b/seminar/views.py
index c43799fd..54ed3e11 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -128,8 +128,9 @@ def sloupec_s_poradim(vysledky):
poradi_l += ["{}.".format(lepsich_resitelu + 1)]
# je-li účastníků se stejným počtem bodů víc, pořadí (rozsah X.-Y.) je jen u prvního
else:
- poradi_l += ["{}.–{}.".format(lepsich_resitelu + 1, lepsich_resitelu + len(skupina))] + [""] * (len(skupina)-1)
+ poradi_l += [u"{}. – {}.".format(lepsich_resitelu + 1, lepsich_resitelu + len(skupina))] + [""] * (len(skupina)-1)
lepsich_resitelu += len(skupina)
+ #pomlcka je opravdu pomlcka v unicode!!dulezite pro vysledkovku v TeXu
return poradi_l