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

Na různých místech změna oddělení (OVVP -> OPMK)

Browse source
This commit is contained in:
LEdoian 2018-03-24 12:34:32 +01:00 committed by Matěj Kocián
parent b5efcdd650
commit 3e1a655d09
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
obalky/obalky-template.tex
View file

@ -47,7 +47,7 @@
\parindent=\fromskip \parindent=\fromskip
\line{\indent\adrfonta Časopis M\&M,\hfil} \line{\indent\adrfonta Časopis M\&M,\hfil}
\vskip3pt \vskip3pt
\line{\indent\adrfontb OVVP UK MFF\hfil} \line{\indent\adrfontb OPMK UK MFF\hfil}
\vskip3pt \vskip3pt
\line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil} \line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil}
\line{\indent\adrfontc Tel.: +420 221 911 235\hss} \line{\indent\adrfontc Tel.: +420 221 911 235\hss}

4
seminar/management/commands/importschools.py
View file

@ -52,7 +52,9 @@ class Command(BaseCommand):
assert len(args) == 1 assert len(args) == 1
filename = args[0] filename = args[0]
self.stdout.write('Parsing OVVP-format file \'%s\' ...' % (filename, )) self.stdout.write(
'Parsing OVVP/OPMK-format file \'%s\' ...' % (filename, )
)
with open(filename, "r") as f: with open(filename, "r") as f:
o = ovvpfile.parse(f) o = ovvpfile.parse(f)

2
seminar/models.py
View file

@ -194,7 +194,7 @@ class Resitel(SeminarModelBase):
return force_unicode(self.plne_jmeno()) return force_unicode(self.plne_jmeno())
def export_row(self): def export_row(self):
"Slovnik pro pouziti v OVVP exportu" "Slovnik pro pouziti v OVVP (OPMK) exportu"
return { return {
'id': self.id, 'id': self.id,
'name': self.jmeno, 'name': self.jmeno,

2
seminar/static/seminar/stvrzenka.sty
View file

@ -6,7 +6,7 @@
{Univerzita Karlova \\ {Univerzita Karlova \\
\indent Matematicko-fyzikální fakulta \\ \indent Matematicko-fyzikální fakulta \\
\indent OVVP, M\&M \\ \indent OPMK, M\&M \\
\indent Ke Karlovu 3, 120 00 Praha 2 \\ \indent Ke Karlovu 3, 120 00 Praha 2 \\
\indent IČ: 00216208 DIČ: CZ00216208} \indent IČ: 00216208 DIČ: CZ00216208}

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

@ -50,7 +50,7 @@
\parindent=\fromskip \parindent=\fromskip
\line{\indent\adrfonta Časopis M\&M,\hfil} \line{\indent\adrfonta Časopis M\&M,\hfil}
\vskip3pt \vskip3pt
\line{\indent\adrfontb OVVP UK MFF\hfil} \line{\indent\adrfontb OPMK UK MFF\hfil}
\vskip3pt \vskip3pt
\line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil} \line{\indent\adrfontc Ke Karlovu 3, 121 16 Praha 2\hfil}
\line{\indent\adrfontc Tel.: +420 221 911 235\hss} \line{\indent\adrfontc Tel.: +420 221 911 235\hss}