diff --git a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex index f3a9d662..d961d39f 100644 --- a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex +++ b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex @@ -1,6 +1,9 @@ +\setlength{\tabcolsep}{3pt} \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 +&&&&\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}}}&{% elif p.typ = "tema" %}\textbf{t{{p.kod}}}&{% else %}\textbf{ {{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.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} +\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}}\\ +{% endfor %} +\end{longtable} diff --git a/seminar/views.py b/seminar/views.py index 54ed3e11..5a11f42a 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -294,6 +294,7 @@ class CisloView(generic.DetailView): v.poradi = poradi v.body_celkem_rocnik = v.body v.body_celkem_odjakziva = VysledkyKCisluOdjakziva.objects.get(resitel=v.resitel, cislo=context['cislo']).body + v.resitel.rocnik = v.resitel.rocnik(v.cislo.rocnik) # je tady '', aby se nezobrazovala 0, pokud se řešitel o řešení úlohy ani nepokusil v.body_ulohy = [''] * len(problemy)