From 5be7209d5814d69a68f815314b885c8abdb9ce3a Mon Sep 17 00:00:00 2001 From: Tomas 'Jethro' Pokorny Date: Tue, 5 Jan 2021 22:21:26 +0100 Subject: [PATCH] seminar | Pridana stranka s odmenami --- seminar/templates/seminar/archiv/odmeny.html | 15 +++++++++++ seminar/urls.py | 1 + seminar/views/views_all.py | 26 ++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 seminar/templates/seminar/archiv/odmeny.html diff --git a/seminar/templates/seminar/archiv/odmeny.html b/seminar/templates/seminar/archiv/odmeny.html new file mode 100644 index 00000000..fab1cb7c --- /dev/null +++ b/seminar/templates/seminar/archiv/odmeny.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block content %} +

+ {% block nadpis1a %}{% block nadpis1b %} + Odměny {{ cislo }} + {% endblock %}{% endblock %} +

+ + +{% endblock content %} diff --git a/seminar/urls.py b/seminar/urls.py index b5211db9..b710a540 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -15,6 +15,7 @@ urlpatterns = [ # Archiv path('archiv/rocniky/', views.ArchivView.as_view(), name="seninar_archiv_rocniky"), path('archiv/temata/', views.ArchivTemataView.as_view(), name="seninar_archiv_temata"), + path('archiv/odmeny///', views.OdmenyView.as_view(), name="seminar_archiv_odmeny"), path('rocnik//', views.RocnikView.as_view(), name='seminar_rocnik'), path('cislo/./', views.CisloView.as_view(), name='seminar_cislo'), diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 657076e7..7ec488b2 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1123,6 +1123,32 @@ class ArchivTemataView(generic.ListView): ctx['rocniky'][rocnik] = list(temata) return ctx +class OdmenyView(generic.TemplateView): + template_name = 'seminar/archiv/odmeny.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + fromcislo_id = self.kwargs.get('fcislo') + tocislo_id = self.kwargs.get('tcislo') + fromcislo = Cislo.objects.get(pk=fromcislo_id) + tocislo = Cislo.objects.get(pk=tocislo_id) + resitele = aktivniResitele(tocislo) + frombody = body_resitelu(resitele, fromcislo) + tobody = body_resitelu(resitele, tocislo) + outlist = [] + for (aid, tbody) in tobody.items(): + fbody = frombody.get(aid,0) + resitel = Resitel.objects.get(pk=aid) + ftitul = resitel.get_titul(fbody) + ttitul = resitel.get_titul(tbody) + if ftitul != ttitul: + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) + context['zmeny'] = outlist + return context + + + + ### Generovani vysledkovky class CisloVysledkovkaView(CisloView):