mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

Browse source
This commit is contained in:
Matěj Kocián 2015-09-12 13:05:58 +02:00
commit 8c66743d1f
5 changed files with 46 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mamweb/templates/base.html
View file

@ -65,7 +65,7 @@
<li class="{% block menu_zadani %}{% endblock %}"><a href="/zadani/aktualni/">Zadání</a>
<li class="{% block menu_clanky %}{% endblock %}"><a href="/clanky/uvod/">Články</a>
<li class="{% block menu_archiv %}{% endblock %}"><a href="/archiv/cisla/">Archiv</a>
<li class="{% block menu_odevzdat %}{% endblock %}">{#<a href="/odevzdat-reseni/muj-ucet">#}Odeslat řešení{#</a>#}
<li class="{% block menu_odevzdat %}{% endblock %}"><a href="/odevzdat-reseni/muj-ucet/">Odeslat řešení</a>
</ul>
{# ======== KONEC MENU =============#}
</div>

9
mamweb/templates/flatpages/default.html
View file

@ -2,12 +2,11 @@
{% block title %}{{ flatpage.title }}{% endblock title %}
{% block nadpis1a %}{% block nadpis1b%}
{{ flatpage.title }}
{% endblock %}{% endblock %}
{% block content %}
<h2>
{% block nadpis1a %}{% block nadpis1b%}
{{ flatpage.title }}
{% endblock %}{% endblock %}
</h2>
<div>
{{ flatpage.content }}

17
mamweb/templates/menu.html Normal file
View file

@ -0,0 +1,17 @@
{% load i18n cache mam_menu %}
{% aktualni_rocniky as rs %}
<ul>
<li><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
<li><a href="{% url 'seminar_seznam_soustredeni' %}">Soustředění</a>
<li><a href="/zadani/aktualni/">Zadání</a>
<li><a href="/clanky/uvod/">Články</a>
<li><a href="/archiv/cisla/">Archiv</a>
<li><a href="/odevzdat-reseni/muj-ucet">Odeslat řešení</a>
</ul>
<!-- TODO smazat <ul>
{% for r in rs %}
<li><a href='{{ r.verejne_url }}'>Ročník {{ r }}</a>
{% endfor %}
</ul>-->

46
seminar/models.py
View file

@ -211,32 +211,32 @@ class Resitel(SeminarModelBase):
}
def rocnik(self, rocnik):
"""Vrati skolni rocnik resitele pro zadany Rocnik.
"""Vrati skolni rocnik resitele pro zadany Rocnik.
Vraci '' pro neznamy rok maturity resitele, Z* pro ekvivalent ZŠ."""
if self.rok_maturity is None:
return ''
rozdil = 5 - (self.rok_maturity - rocnik.prvni_rok)
if rozdil >= 1:
return str(rozdil)
else:
return 'Z' + str(rozdil + 9)
if self.rok_maturity is None:
return ''
rozdil = 5 - (self.rok_maturity - rocnik.prvni_rok)
if rozdil >= 1:
return str(rozdil)
else:
return 'Z' + str(rozdil + 9)
def get_titul(self, celkove_body):
"Vrati titul podle zadaneho poctu bodu."
if celkove_body < 10:
return ''
elif celkove_body < 20:
return 'Bc.'
elif celkove_body < 50:
return 'Mgr.'
elif celkove_body < 100:
return 'Dr.'
elif celkove_body < 200:
return 'Doc.'
elif celkove_body < 500:
return 'Prof.'
else:
return 'Akad.'
"Vrati titul podle zadaneho poctu bodu."
if celkove_body < 10:
return ''
elif celkove_body < 20:
return 'Bc.'
elif celkove_body < 50:
return 'Mgr.'
elif celkove_body < 100:
return 'Dr.'
elif celkove_body < 200:
return 'Doc.'
elif celkove_body < 500:
return 'Prof.'
else:
return 'Akad.'

1
seminar/templates/seminar/novinky.html
View file

@ -29,3 +29,4 @@
{% endif %}
</div>
{% endfor%}