mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'test'

Browse source
This commit is contained in:
Pavel 'LEdoian' Turinsky 2019-11-27 02:11:48 +01:00
commit b1d2e19488
5 changed files with 4 additions and 1605 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
seminar/admin.py
View file

@ -209,6 +209,7 @@ class ResitelAdmin(VersionAdmin):
(u'Seminář', {'fields': ['datum_souhlasu_udaje', 'datum_souhlasu_zasilani', 'datum_prihlaseni', 'zasilat']}), (u'Seminář', {'fields': ['datum_souhlasu_udaje', 'datum_souhlasu_zasilani', 'datum_prihlaseni', 'zasilat']}),
(u'Osobní údaje', {'fields': ['pohlavi_muz', 'datum_narozeni', 'email', 'telefon']}), (u'Osobní údaje', {'fields': ['pohlavi_muz', 'datum_narozeni', 'email', 'telefon']}),
(u'Adresa', {'fields': ['ulice', 'mesto', 'psc', 'stat']}), (u'Adresa', {'fields': ['ulice', 'mesto', 'psc', 'stat']}),
(u'Další', {'fields': ['poznamka']}),
] ]
list_display = ['jmeno', 'prijmeni', 'user', 'pohlavi_muz', 'skola', 'rok_maturity', 'pocet_reseni'] list_display = ['jmeno', 'prijmeni', 'user', 'pohlavi_muz', 'skola', 'rok_maturity', 'pocet_reseni']
list_filter = ['pohlavi_muz', 'rok_maturity', 'zasilat'] list_filter = ['pohlavi_muz', 'rok_maturity', 'zasilat']

1603
seminar/static/seminar/lisak.eps
View file

File diff suppressed because it is too large Load diff

BIN
seminar/static/seminar/lisak.pdf Normal file
View file

Binary file not shown.

3
seminar/templates/seminar/archiv/obalky.tex
View file

@ -86,7 +86,8 @@
% Tohle makro vysází samotnou obálku % Tohle makro vysází samotnou obálku
\def\obalka#1#2#3#4#5#6#7{ \def\obalka#1#2#3#4#5#6#7{
% Horní a pravý okraj je zároveň okraj stránky, resetujeme odsazení % Horní a pravý okraj je zároveň okraj stránky, resetujeme odsazení
\includegraphics[height=2.55cm]{lisak.eps}\hskip 1 em\vbox{% \includegraphics[height=2.55cm]{lisak.pdf}
\vbox{%
\adresaMaM} \adresaMaM}
\vskip 7.3 cm % Od oka \vskip 7.3 cm % Od oka
\hskip\toskip% \hskip\toskip%

2
seminar/views.py
View file

@ -572,7 +572,7 @@ def obalkyView(request,resitele):
tempdir = tempfile.mkdtemp() tempdir = tempfile.mkdtemp()
with open(tempdir+"/obalky.tex","w") as texfile: with open(tempdir+"/obalky.tex","w") as texfile:
texfile.write(tex) texfile.write(tex)
shutil.copy(os.path.join(settings.STATIC_ROOT, 'seminar/lisak.eps'),tempdir) shutil.copy(os.path.join(settings.STATIC_ROOT, 'seminar/lisak.pdf'),tempdir)
subprocess.call(["pdflatex","obalky.tex"],cwd = tempdir) subprocess.call(["pdflatex","obalky.tex"],cwd = tempdir)
with open(tempdir+"/obalky.pdf","rb") as pdffile: with open(tempdir+"/obalky.pdf","rb") as pdffile: