From c75ab09ff2421412c65b3383f8448945642507f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 29 Nov 2021 23:31:29 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Chyb=C4=9Bj=C3=ADc=C3=AD=20import=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/models/tvorba.py | 1 + 1 file changed, 1 insertion(+) diff --git a/seminar/models/tvorba.py b/seminar/models/tvorba.py index 3e914efd..fdf91273 100644 --- a/seminar/models/tvorba.py +++ b/seminar/models/tvorba.py @@ -6,6 +6,7 @@ import tempfile import logging from django.contrib.sites.shortcuts import get_current_site +from django.core.files.storage import FileSystemStorage from django.db import models from django.utils import timezone from django.conf import settings From 9cb5c8ca5911e33e92dd2424800d29fb13048868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 29 Nov 2021 23:31:55 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Se=C5=99azen=C3=AD=20podprobl=C3=A9m=C5=AF?= =?UTF-8?q?=20podle=20k=C3=B3du=20m=C3=ADsto=20podle=20jm=C3=A9na?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/seminar/utils.py b/seminar/utils.py index cacc52d8..9bca3c37 100644 --- a/seminar/utils.py +++ b/seminar/utils.py @@ -309,6 +309,9 @@ def podproblemy_v_cislu(cislo, problemy=None, hlavni_problemy=None): else: podproblemy[-1].append(problem) + for podproblem in podproblemy.keys(): + podproblemy[podproblem] = sorted(podproblemy[podproblem], key=lambda it: it.kod) + return podproblemy class TypDeadline(Enum): From abc479b5493c1cb197f51a2cea571b154e846aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 29 Nov 2021 23:46:30 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Se=C5=99azen=C3=AD=20podprobl=C3=A9m=C5=AF?= =?UTF-8?q?=20podle=20k=C3=B3du=20m=C3=ADsto=20podle=20jm=C3=A9na?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/seminar/utils.py b/seminar/utils.py index 9bca3c37..176831cb 100644 --- a/seminar/utils.py +++ b/seminar/utils.py @@ -310,7 +310,13 @@ def podproblemy_v_cislu(cislo, problemy=None, hlavni_problemy=None): podproblemy[-1].append(problem) for podproblem in podproblemy.keys(): - podproblemy[podproblem] = sorted(podproblemy[podproblem], key=lambda it: it.kod) + def int_or_zero(p): + try: + return int(p.kod) + except ValueError: + return 0 + + podproblemy[podproblem] = sorted(podproblemy[podproblem], key=int_or_zero) return podproblemy