From 0b9106cd33c77b25610b39b5a77b365cbae51158 Mon Sep 17 00:00:00 2001
From: Aneta <aneta.stastna@email.cz>
Date: Thu, 3 Sep 2015 22:09:35 +0200
Subject: [PATCH] =?UTF-8?q?Za=C4=8D=C3=A1tek=20pr=C3=A1ce=20na=20tituln?=
=?UTF-8?q?=C3=AD=20stran=C4=9B.=20Vytvo=C5=99en=C3=AD=20url,=20view=20a?=
=?UTF-8?q?=20template.=20H=C3=A1z=C3=AD=20chybu=20"Type=20Error:=20=5F=5F?=
=?UTF-8?q?init=5F=5F()=20takes=20exactly=201=20argument=20(2=20given)"=20?=
=?UTF-8?q?v=20n=C4=9Bjak=C3=A9=20vnit=C5=99n=C3=AD=20funkci.=20Nev=C3=ADm?=
=?UTF-8?q?=20co=20s=20t=C3=ADm.=20A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
seminar/templates/seminar/titulnistrana.html | 1 +
seminar/urls.py | 1 +
seminar/views.py | 17 +++++++----------
3 files changed, 9 insertions(+), 10 deletions(-)
create mode 100644 seminar/templates/seminar/titulnistrana.html
diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
new file mode 100644
index 00000000..09eec623
--- /dev/null
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -0,0 +1 @@
+Hurá!
diff --git a/seminar/urls.py b/seminar/urls.py
index b392fe2c..3c000874 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -17,6 +17,7 @@ urlpatterns = patterns('',
url(r'^soustredeni/(?P<pk>\d+)/$', views.SoustredeniView.as_view(), name='seminar_soustredeni'),
url(r'^zadani/aktualni/$', views.AktualniZadaniView, name='seminar_aktualni_zadani'),
+ url(r'^$', views.TitulniStranaView, name='titulni_strana'),
url(r'^stav$', views.StavDatabazeView, name='stav_databaze'),
diff --git a/seminar/views.py b/seminar/views.py
index e6136135..c654f60f 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -5,16 +5,22 @@ from django.views import generic
from django.utils.translation import ugettext as _
from django.http import Http404
-from .models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel
+from .models import Problem, Cislo, Reseni, Nastaveni, Rocnik, Soustredeni, Organizator, Resitel, Novinky
from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva
from . import utils
+
def AktualniZadaniView(request):
nastaveni = get_object_or_404(Nastaveni)
return render(request, 'seminar/zadani/AktualniZadani.html',
{'nastaveni' : nastaveni,
},
)
+### Titulni strana
+
+class TitulniStranaView(generic.ListView):
+ model = Novinky
+ template_name='seminar/titulnistrana.html'
### Co je M&M
@@ -65,8 +71,6 @@ class RocnikView(generic.DetailView):
#vyberu vsechny verejne vysledky z rocniku
vysledky = cisla_v_rocniku.filter(cislo = cisla_v_rocniku[0].cislo).order_by('-body', 'resitel__prijmeni', 'resitel__jmeno').select_related('resitel')
#vybere vsechny vysledky z posledniho verejneho cisla a setridi sestupne dle bodu
- # cisla = Cislo.objects.all().filter(rocnik.id = context['rocnik'].id).order_by('+cislo')
-
vysledky_resitele = {}
stejne_body = {}
konec_rozmezi = {}
@@ -129,13 +133,6 @@ class RocnikView(generic.DetailView):
context['vysledkovka'] = vysledkovka
return context
-''' for r in reseni:
- vysledky_resitele[r.resitel.id].body[problem_index[r.problem.id]] = r.body
- body_za_cislo = vysledky_resitele[r.resitel.id].vysledek.body
- #body za toto cislo, stejne jako tv.vysledek.body
- body_celkem = vysledky_resitele[r.resitel.id].vysledek.body_celkem
- vysledky_resitele[r.resitel.id].body_minule = body_celkem - body_za_cislo
- '''
class ProblemView(generic.DetailView):
model = Problem