From ab4148e2e271c7bd1a936e5ba7f4c3adfb01970a Mon Sep 17 00:00:00 2001 From: Anet Date: Sun, 23 Aug 2020 23:22:17 +0200 Subject: [PATCH] orgorozcestnik: nabuseni statickych odkazu, pokus o nejake lehke dynamicke veci - rozdelane --- .../templates/seminar/clanky/resitelske_clanky.html | 2 +- seminar/urls.py | 3 +++ seminar/views/views_all.py | 11 ++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/seminar/templates/seminar/clanky/resitelske_clanky.html b/seminar/templates/seminar/clanky/resitelske_clanky.html index 1e15fcbc..84089753 100644 --- a/seminar/templates/seminar/clanky/resitelske_clanky.html +++ b/seminar/templates/seminar/clanky/resitelske_clanky.html @@ -17,7 +17,7 @@ {% for clanek in object_list %} -{% with clanek.cislo_zadani.rocnik.rocnik as rocnik %} +{% with clanek.cislo.rocnik.rocnik as rocnik %} {% ifchanged rocnik %} {% if not forloop.first %}{% endif %}

{{ rocnik }}. ročník

diff --git a/seminar/urls.py b/seminar/urls.py index df2e1435..9c72717e 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -90,6 +90,9 @@ urlpatterns = [ path('org/vloz_body//', staff_member_required(views.VlozBodyView.as_view()),name='seminar_org_vlozbody'), + # příprava na nestatický orgorozcestník + path('org/rozcestnik', + staff_member_required(views.OrgoRozcestnikView.as_view()),name='seminar_org_rozcestnik'), path('prihlaska/',views.prihlaskaView, name='seminar_prihlaska'), path('login/', views.LoginView.as_view(), name='login'), path('logout/', views.LogoutView.as_view(), name='logout'), diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index af34e69e..a80623d7 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -873,6 +873,16 @@ def oldObalkovaniView(request, rocnik, cislo): {'cislo': cislo, 'problemy': problemy, 'reseni': reseni} ) +### Orgostránky + +def OrgoRozcestnikView(request): + ''' Zobrazí organizátorský rozcestník.''' + posledni_soustredeni = Soustredeni.objects.order_by('-datum_konce').first() + + template_name = 'seminar/orgorozcestnik.html' + content_type = 'text/plain; charset=UTF8' + #XXX + ### Tituly def TitulyView(request, rocnik, cislo): @@ -983,7 +993,6 @@ class ClankyResitelView(generic.ListView): skupina.sort(key=lambda clanek: clanek.kod_v_rocniku()) for clanek in skupina: queryset.append(clanek) - #XXX #zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod')