From 9510c1d3878408741b203786e5b21f90a52ef8e6 Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Thu, 25 Jul 2019 21:15:48 +0200
Subject: [PATCH] Opraveno generovani obalek.

---
 seminar/templates/seminar/archiv/obalky.tex | 12 ++++++++----
 seminar/views.py                            |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/seminar/templates/seminar/archiv/obalky.tex b/seminar/templates/seminar/archiv/obalky.tex
index 4995d105..ea20f63d 100644
--- a/seminar/templates/seminar/archiv/obalky.tex
+++ b/seminar/templates/seminar/archiv/obalky.tex
@@ -96,25 +96,29 @@
 
 
 {% for r in resitele %}
+	{% with o=r.osoba %}
+	{% with s=r.osoba.skola %}
 	{% spaceless %}
 	{% if r.zasilat == "do_skoly" %} 
 		{% if r.stat == "CZ" %}
-\obalka{{r.jmeno|sloz}}{{r.prijmeni|sloz}}{{r.skola.nazev|sloz}}{{r.skola.ulice|sloz}}{{r.skola.psc|sloz}}{{r.skola.mesto|sloz}}{{''|sloz}}
+\obalka{{o.jmeno|sloz}}{{o.prijmeni|sloz}}{{s.nazev|sloz}}{{s.ulice|sloz}}{{s.psc|sloz}}{{s.mesto|sloz}}{{''|sloz}}
 		{% else %}
-\obalka{{r.jmeno|sloz}}{{r.prijmeni|sloz}}{{r.skola.nazev|sloz}}{{r.skola.ulice|sloz}}{{r.skola.psc|sloz}}{{r.skola.mesto|sloz}}{{r.stat.name|sloz}}
+\obalka{{o.jmeno|sloz}}{{o.prijmeni|sloz}}{{s.nazev|sloz}}{{s.ulice|sloz}}{{s.psc|sloz}}{{s.mesto|sloz}}{{o.stat.name|sloz}}
 		{% endif %}
 
 	{% elif r.zasilat == "domu" %}
 		{% if r.stat == "CZ" %}
-\obalka{{r.jmeno|sloz}}{{r.prijmeni|sloz}}{{''|sloz}}{{r.ulice|sloz}}{{r.psc|sloz}}{{r.mesto|sloz}}{{''|sloz}}
+\obalka{{o.jmeno|sloz}}{{o.prijmeni|sloz}}{{''|sloz}}{{o.ulice|sloz}}{{o.psc|sloz}}{{o.mesto|sloz}}{{''|sloz}}
 		{% else %}
-\obalka{{r.jmeno|sloz}}{{r.prijmeni|sloz}}{{''|sloz}}{{r.ulice|sloz}}{{r.psc|sloz}}{{r.mesto|sloz}}{{r.stat.name|sloz}}
+\obalka{{o.jmeno|sloz}}{{o.prijmeni|sloz}}{{''|sloz}}{{o.ulice|sloz}}{{o.psc|sloz}}{{o.mesto|sloz}}{{o.stat.name|sloz}}
 		{% endif %}
 	{% else %}
 % zasilat: {{r.zasilat}}
 %\obalka{{r.jmeno|sloz}}{{r.prijmeni|sloz}}{{''|sloz}}{{r.ulice|sloz}}{{r.psc|sloz}}{{r.mesto|sloz}}{{r.stat.name|sloz}}
 	{% endif %}
 	{% endspaceless %}
+	{% endwith %}
+	{% endwith %}
 {% endfor %}
 \end{document}
 
diff --git a/seminar/views.py b/seminar/views.py
index 7ac0701e..0829711a 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -524,7 +524,7 @@ def obalkyView(request,resitele):
 	tex = render(request,'seminar/archiv/obalky.tex', {'resitele': resitele}).content
 
 	tempdir = tempfile.mkdtemp()
-	with open(tempdir+"/obalky.tex","w") as texfile:
+	with open(tempdir+"/obalky.tex","wb") as texfile:
 		texfile.write(tex)
 	shutil.copy(os.path.join(settings.STATIC_ROOT, 'seminar/lisak.eps'),tempdir)
 	subprocess.call(["pdflatex","obalky.tex"],cwd = tempdir)