From ea26c48650e81d3cfb8940fe08920ca2d5a09e5a Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Sun, 13 Sep 2015 16:52:30 +0200
Subject: [PATCH 1/2] Staticky odpocet

---
 seminar/templates/seminar/titulnistrana.html |  5 +++++
 seminar/views.py                             | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 27ab9042..d135e9e6 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -9,6 +9,11 @@
       Tož vitajte!
     {% endblock %}{% endblock %}
   </h2>
+
+  <div class="odpocet">
+    Do konce odeslání řešení zbývá: {{cas_do_konce}}.
+  </div>
+
   <p> <center>
   My jsme M&M, mezioborový korespondenční seminář.
   <li> Mezioborový: matematika, fyzika, informatika.
diff --git a/seminar/views.py b/seminar/views.py
index e2549fd7..320ec359 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -11,7 +11,7 @@ from .models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Orga
 from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva
 from . import utils
 
-from datetime import timedelta, date
+from datetime import timedelta, date, datetime
 from itertools import groupby
 
 
@@ -44,9 +44,18 @@ class TitulniStranaView(generic.ListView):
     template_name='seminar/titulnistrana.html'
     queryset = Novinky.objects.filter(zverejneno=True).order_by('-datum')[:5]
 
-    #def get_context_data(self, **kwargs):
-    #    context = super(TitulniStranaView, self).get_context_data(**kwargs)
-    #    return context
+    def get_context_data(self, **kwargs):
+        context = super(TitulniStranaView, self).get_context_data(**kwargs)
+        nastaveni = get_object_or_404(Nastaveni)
+        cas_deadline = nastaveni.aktualni_cislo.datum_deadline
+        cas_do_konce =  datetime.combine(cas_deadline, datetime.min.time()) \
+                - datetime.now()
+        context['cas_do_konce'] = \
+                str(cas_do_konce.days) + " dní " + \
+                str(cas_do_konce.seconds / 3600) + " hodin " + \
+                str((cas_do_konce.seconds / 60) % 60)+" min " + \
+                str(cas_do_konce.seconds % 60) + " sekund"
+        return context
 
 class StareNovinkyView(generic.ListView):
     model = Novinky

From 543e0de243c7a6298428f815bd725e4560759491 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Sun, 13 Sep 2015 17:06:22 +0200
Subject: [PATCH 2/2] Zobrazovani casu do konce

TODO humanize
---
 seminar/templates/seminar/titulnistrana.html | 13 ++++++++++++-
 seminar/views.py                             | 11 +++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index d135e9e6..18c6184b 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -11,7 +11,18 @@
   </h2>
 
   <div class="odpocet">
-    Do konce odeslání řešení zbývá: {{cas_do_konce}}.
+    Do konce odeslání řešení zbývá:
+    {# TODO humanize #}
+     {{cas_do_konce_dni}} dní
+     {% if cas_do_konce_dni < 5 %}
+       {{cas_do_konce_hodin}} hodin
+       {% if cas_do_konce_hodin < 5 %}
+         {{cas_do_konce_minut}} minut
+         {% if cas_do_konce_minut < 5 %}
+           {{cas_do_konce_sekund}}
+         {% endif %}
+       {% endif %}
+     {% endif %}
   </div>
 
   <p> <center>
diff --git a/seminar/views.py b/seminar/views.py
index 5d29dfe2..7727548f 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -48,13 +48,12 @@ class TitulniStranaView(generic.ListView):
         context = super(TitulniStranaView, self).get_context_data(**kwargs)
         nastaveni = get_object_or_404(Nastaveni)
         cas_deadline = nastaveni.aktualni_cislo.datum_deadline
-        cas_do_konce =  datetime.combine(cas_deadline, datetime.min.time()) \
+        rozdil_casu =  datetime.combine(cas_deadline, datetime.max.time()) \
                 - datetime.now()
-        context['cas_do_konce'] = \
-                str(cas_do_konce.days) + " dní " + \
-                str(cas_do_konce.seconds / 3600) + " hodin " + \
-                str((cas_do_konce.seconds / 60) % 60)+" min " + \
-                str(cas_do_konce.seconds % 60) + " sekund"
+        context['cas_do_konce_dni']    = rozdil_casu.days
+        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
         return context
 
 class StareNovinkyView(generic.ListView):