Browse Source

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

remotes/origin/test
LEdoian 6 years ago
committed by Matěj Kocián
parent
commit
3e1a655d09
  1. 2
      obalky/obalky-template.tex
  2. 4
      seminar/management/commands/importschools.py
  3. 2
      seminar/models.py
  4. 2
      seminar/static/seminar/stvrzenka.sty
  5. 2
      seminar/templates/seminar/archiv/obalky.tex

2
obalky/obalky-template.tex

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

4
seminar/management/commands/importschools.py

@ -52,7 +52,9 @@ class Command(BaseCommand):
assert len(args) == 1
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:
o = ovvpfile.parse(f)

2
seminar/models.py

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

2
seminar/static/seminar/stvrzenka.sty

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

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

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

Loading…
Cancel
Save