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

Sjednocení zobrazení bodů v závorce

Browse source
This commit is contained in:
Matěj Kocián 2015-09-10 15:45:27 +02:00
parent dd67c977b8
commit 0983f397c5
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
seminar/models.py
View file

@ -469,6 +469,9 @@ class Problem(SeminarModelBase):
else:
return reverse('admin:seminar_problemnavrh_change', args=(self.id, ))
def body_v_zavorce(self):
return u"({}\u2009b)".format(self.body) if self.body else ""
@reversion.register(ignore_duplicate_revisions=True)
@python_2_unicode_compatible

4
seminar/templates/seminar/archiv/cislo.html
View file

@ -13,14 +13,14 @@
<h3>Zadané problémy</h3>
<ul>
{% for p in v_cisle_zadane %}
<li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
<li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}</a>
{% endfor %}
</ul>
<h3>Řešené problémy</h3>
<ul>
{% for p in resene_problemy %}
<li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} ({{ p.body }}b)</a>
<li><a href='{{ p.verejne_url }}'>{{ p.kod_v_rocniku }} {{ p.nazev }} {{ p.body_v_zavorce }}</a>
{% endfor %}
</ul>

5
seminar/templates/seminar/archiv/problem.html
View file

@ -7,10 +7,7 @@
{% if problem.cislo_zadani %}
<h2>
{% block nadpis1a %}{% block nadpis1b %}
{{ problem.nazev_typu }} {{ problem.kod_v_rocniku }}: {{ problem.nazev }}
{% if problem.body %}
({{ problem.body }}b)
{% endif %}
{{ problem.nazev_typu }} {{ problem.kod_v_rocniku }}: {{ problem.nazev }} {{ problem.body_v_zavorce }}
{% endblock %}{% endblock %}
</h2>

4
seminar/templates/seminar/zadani/AktualniZadani.html
View file

@ -23,9 +23,7 @@
{# publikace jednotlivych zadani #}
{% for problem in sada %}
{# TODO použít {{problem.kod_v_rocniku}} ? vrací 4.u1 místo 4.1 #}
<h4>{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}}
{# nezobrazuj body, pokud nejsou zadane #}
{% if problem.body %}({{problem.body}}b){% endif %}</h4>
<h4>{{problem.cislo_zadani.cislo}}.{{problem.kod}} {{problem.nazev}} {{ problem.body_v_zavorce }}</h4>
{% autoescape off %}{{problem.text_zadani}}{% endautoescape %}
<hr>
{% endfor %}