From 1a9728501d17432e48b973f6a9d8b79b0b3b66e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Mon, 30 May 2016 22:58:37 +0200 Subject: [PATCH] =?UTF-8?q?Ob=C3=A1lkov=C3=A1n=C3=AD:=20=C5=99azen=C3=AD?= =?UTF-8?q?=20=C5=99e=C5=A1itel=C5=AF=20v=20datab=C3=A1zi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/views.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/seminar/views.py b/seminar/views.py index d2477ca1..aa320a57 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -459,11 +459,22 @@ def obalkovaniView(request, rocnik, cislo): rocnik = Rocnik.objects.get(rocnik=rocnik) cislo = Cislo.objects.get(rocnik=rocnik, cislo=cislo) - reseni = Reseni.objects.filter(cislo_body=cislo) - serazena_reseni = sorted(reseni, key=lambda r: (r.resitel.prijmeni, r.resitel.jmeno, r.problem.typ, r.problem.kod)) + reseni = ( + Reseni.objects.filter(cislo_body=cislo) + .order_by( + 'resitel__prijmeni', + 'resitel__jmeno', + 'problem__typ', + 'problem__kod' + ) + ) problemy = sorted(set(r.problem for r in reseni), key=lambda p: (p.typ, p.kod)) - return render(request, 'seminar/archiv/cislo_obalkovani.html', {'cislo': cislo, 'problemy': problemy, 'reseni': serazena_reseni}) + return render( + request, + 'seminar/archiv/cislo_obalkovani.html', + {'cislo': cislo, 'problemy': problemy, 'reseni': reseni} + ) ### Tituly