diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index 0925a22e..a46085cf 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -106,6 +106,7 @@ INSTALLED_APPS = ( 'django_comments', 'django.contrib.flatpages', + 'django.contrib.humanize', # MaMweb 'mamweb', diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html index a432b175..e29fec4d 100644 --- a/seminar/templates/seminar/titulnistrana.html +++ b/seminar/templates/seminar/titulnistrana.html @@ -1,5 +1,7 @@ {% extends 'base.html' %} +{% load humanize %} + {% block content %} @@ -11,8 +13,11 @@
- Do termínu odeslání řešení zbývá: {# TODO humanize #} + Do konce odeslání řešení zbývá: + + {{ted|timesince:dead}} + {{cas_do_konce_dni}} dní {% if cas_do_konce_dni < 5 %} {{cas_do_konce_hodin}} hodin @@ -23,6 +28,7 @@ {% endif %} {% endif %} {% endif %} +

Co je na nás skvělé?

diff --git a/seminar/views.py b/seminar/views.py index 7727548f..d7cdbfad 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -54,6 +54,8 @@ class TitulniStranaView(generic.ListView): context['cas_do_konce_hodin'] = rozdil_casu.seconds / 3600 context['cas_do_konce_minut'] = (rozdil_casu.seconds / 60) % 60 context['cas_do_konce_sekund'] = rozdil_casu.seconds % 60 + context['dead'] = datetime.combine(cas_deadline, datetime.max.time()) + context['ted'] = datetime.now() return context class StareNovinkyView(generic.ListView):