diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index 698c5d29..f53f8f50 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -45,6 +45,7 @@
  • Tituly (TeX)
  • Výsledkovka (TeX)
  • Obálkování
  • +
  • Odměny
  • {% endif %} diff --git a/seminar/urls.py b/seminar/urls.py index b710a540..e38e262e 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -15,7 +15,6 @@ 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'), @@ -115,6 +114,10 @@ urlpatterns = [ org_required(views.ObalkovaniView.as_view()), name='seminar_cislo_resitel_obalkovani' ), + path( + 'cislo/./odmeny/./', + org_required(views.OdmenyView.as_view()), + name="seminar_archiv_odmeny"), path( 'soustredeni//obalky.pdf', org_required(views.soustredeniObalkyView), diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 7ec488b2..9b272b53 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1107,6 +1107,7 @@ class CisloView(generic.DetailView): context = super(CisloView, self).get_context_data(**kwargs) cislo = context['cislo'] + context['prevcislo'] = Cislo.objects.filter((Q(rocnik__lt=self.object.rocnik) | Q(poradi__lt=self.object.poradi))&Q(rocnik__lte=self.object.rocnik)).first() # vrátíme context (aktuálně obsahuje jen věci ohledně výsledkovky return vysledkovka_cisla(cislo, context) @@ -1128,10 +1129,8 @@ class OdmenyView(generic.TemplateView): 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) + fromcislo = Cislo.objects.get(rocnik=self.kwargs.get('frocnik'), poradi=self.kwargs.get('fcislo')) + tocislo = Cislo.objects.get(rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) resitele = aktivniResitele(tocislo) frombody = body_resitelu(resitele, fromcislo) tobody = body_resitelu(resitele, tocislo)