mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

orgorozcestnik: nabuseni statickych odkazu, pokus o nejake lehke dynamicke veci - rozdelane

Browse source
This commit is contained in:
Anet 2020-08-23 23:22:17 +02:00
parent 11fe593c0e
commit ab4148e2e2
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
seminar/templates/seminar/clanky/resitelske_clanky.html
View file

@ -17,7 +17,7 @@
</h1> </h1>
{% for clanek in object_list %} {% for clanek in object_list %}
{% with clanek.cislo_zadani.rocnik.rocnik as rocnik %} {% with clanek.cislo.rocnik.rocnik as rocnik %}
{% ifchanged rocnik %} {% ifchanged rocnik %}
{% if not forloop.first %}</ul>{% endif %} {% if not forloop.first %}</ul>{% endif %}
<h2>{{ rocnik }}. ročník</h2> <h2>{{ rocnik }}. ročník</h2>

3
seminar/urls.py
View file

@ -90,6 +90,9 @@ urlpatterns = [
path('org/vloz_body/<int:tema>/', path('org/vloz_body/<int:tema>/',
staff_member_required(views.VlozBodyView.as_view()),name='seminar_org_vlozbody'), 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('prihlaska/',views.prihlaskaView, name='seminar_prihlaska'),
path('login/', views.LoginView.as_view(), name='login'), path('login/', views.LoginView.as_view(), name='login'),
path('logout/', views.LogoutView.as_view(), name='logout'), path('logout/', views.LogoutView.as_view(), name='logout'),

11
seminar/views/views_all.py
View file

@ -873,6 +873,16 @@ def oldObalkovaniView(request, rocnik, cislo):
{'cislo': cislo, 'problemy': problemy, 'reseni': reseni} {'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 ### Tituly
def TitulyView(request, rocnik, cislo): def TitulyView(request, rocnik, cislo):
@ -983,7 +993,6 @@ class ClankyResitelView(generic.ListView):
skupina.sort(key=lambda clanek: clanek.kod_v_rocniku()) skupina.sort(key=lambda clanek: clanek.kod_v_rocniku())
for clanek in skupina: for clanek in skupina:
queryset.append(clanek) queryset.append(clanek)
#XXX
#zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod') #zadani__rocnik').order_by('-cislo_zadani__rocnik__rocnik', 'kod')