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

Merge branch 'Petr'

Browse source
This commit is contained in:
Bc. Petr Pecha 2015-09-13 18:22:13 +02:00
commit b313183ffb
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
seminar/templates/seminar/titulnistrana.html
View file

@ -13,25 +13,26 @@
{% endblock %}{% endblock %} {% endblock %}{% endblock %}
</h2> </h2>
{% if dead %}
<div class="odpocet"> <div class="odpocet">
Do konce odeslání řešení zbývá: Do konce odeslání řešení zbývá:
{{ted|timesince:dead}} {{ted|timesince:dead}}
<!-- <!--
{{cas_do_konce_dni}} dní {{cas_do_konce_dni}} dní
{% if cas_do_konce_dni < 5 %} {% if cas_do_konce_dni < 5 %}
{{cas_do_konce_hodin}} hodin {{cas_do_konce_hodin}} hodin
{% if cas_do_konce_hodin < 5 %} {% if cas_do_konce_hodin < 5 %}
{{cas_do_konce_minut}} minut {{cas_do_konce_minut}} minut
{% if cas_do_konce_minut < 5 %} {% if cas_do_konce_minut < 5 %}
{{cas_do_konce_sekund}} {{cas_do_konce_sekund}}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
--> -->
</div> </div>
{% endif %}
<p> <center> <p> <center>
My jsme M&M, mezioborový korespondenční seminář. My jsme M&M, mezioborový korespondenční seminář.

19
seminar/views.py
View file

@ -48,14 +48,17 @@ class TitulniStranaView(generic.ListView):
context = super(TitulniStranaView, self).get_context_data(**kwargs) context = super(TitulniStranaView, self).get_context_data(**kwargs)
nastaveni = get_object_or_404(Nastaveni) nastaveni = get_object_or_404(Nastaveni)
cas_deadline = nastaveni.aktualni_cislo.datum_deadline cas_deadline = nastaveni.aktualni_cislo.datum_deadline
rozdil_casu = datetime.combine(cas_deadline, datetime.max.time()) \ try:
- datetime.now() rozdil_casu = datetime.combine(cas_deadline, datetime.max.time()) \
context['cas_do_konce_dni'] = rozdil_casu.days - datetime.now()
context['cas_do_konce_hodin'] = rozdil_casu.seconds / 3600 context['cas_do_konce_dni'] = rozdil_casu.days
context['cas_do_konce_minut'] = (rozdil_casu.seconds / 60) % 60 context['cas_do_konce_hodin'] = rozdil_casu.seconds / 3600
context['cas_do_konce_sekund'] = rozdil_casu.seconds % 60 context['cas_do_konce_minut'] = (rozdil_casu.seconds / 60) % 60
context['dead'] = datetime.combine(cas_deadline, datetime.max.time()) context['cas_do_konce_sekund'] = rozdil_casu.seconds % 60
context['ted'] = datetime.now() context['dead'] = datetime.combine(cas_deadline, datetime.max.time())
context['ted'] = datetime.now()
except:
context['dead'] = None
return context return context
class StareNovinkyView(generic.ListView): class StareNovinkyView(generic.ListView):