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

Oprava nastaveni posilani chybovych mailu

Browse source
This commit is contained in:
Tomas Gavenciak 2015-07-23 22:50:36 +02:00
parent 99bb7da096
commit 35d9f0ccd1
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mamweb/settings_prod.py
View file

@ -33,8 +33,11 @@ DATABASES = {
import os import os
SERVER_EMAIL = 'prod-errors@mam.mff.cuni.cz' SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
ADMINS = ['gavento@ucw.cz', ] ADMINS = [
('Tomas Gavenciak', 'gavento@ucw.cz'),
]
# LOGGING = { # LOGGING = {
# 'version': 1, # 'version': 1,

7
seminar/models.py
View file

@ -211,7 +211,10 @@ class Resitel(SeminarModelBase):
} }
def rocnik(self, datum): def rocnik(self, datum):
"Vypise skolni rocnik resitele pro zadane datum typu datetime." """Vypise skolni rocnik resitele pro zadane datum typu datetime.
Vraci None pro neznamy rocnik."""
if self.rok_maturity is None:
return None
rozdil = self.rok_maturity - datum.year rozdil = self.rok_maturity - datum.year
if datum.month < 9: if datum.month < 9:
return 4 - rozdil return 4 - rozdil
@ -221,7 +224,7 @@ class Resitel(SeminarModelBase):
def titul(self, celkove_body): def titul(self, celkove_body):
"Vrati titul podle zadaneho poctu bodu." "Vrati titul podle zadaneho poctu bodu."
if celkove_body < 10: if celkove_body < 10:
return None return ''
elif celkove_body < 20: elif celkove_body < 20:
return 'Bc.' return 'Bc.'
elif celkove_body < 50: elif celkove_body < 50:

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

@ -24,7 +24,7 @@
{% if rv.resitel.titul %} {% if rv.resitel.titul %}
\titul{ {{ rv.resitel.titul }} } \titul{ {{ rv.resitel.titul }} }
{% endif %} {% endif %}
{{ rv.resitel.plne_jmeno }} & {{ rv.resitel.rocnik}} & {{ rv.body_minule }} {{ rv.resitel.plne_jmeno }} & {{ rv.resitel.rocnik |default:"" }} & {{ rv.body_minule }}
{% for b in rv.body %} {% for b in rv.body %}
{{ b }} & {{ b }} &
{% endfor %} {% endfor %}