From 74a26affa7c6451145f084e667f4f79cc14e2b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 22 May 2023 23:02:32 +0200 Subject: [PATCH] =?UTF-8?q?Odevzd=C3=A1v=C3=A1tko:=20Odevzdateln=C3=A9=20p?= =?UTF-8?q?robl=C3=A9my=20jsou=20v=C5=A1echny=20zadan=C3=A9=20(v=C4=8Detn?= =?UTF-8?q?=C4=9B=20minul=C3=BDch=20ro=C4=8Dn=C3=ADk=C5=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/views/autocomplete.py | 15 +-------------- odevzdavatko/views.py | 10 +--------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/api/views/autocomplete.py b/api/views/autocomplete.py index 8eded250..bdae5e06 100644 --- a/api/views/autocomplete.py +++ b/api/views/autocomplete.py @@ -70,20 +70,7 @@ class PublicResitelAutocomplete(LoginRequiredAjaxMixin, autocomplete.Select2Quer class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView): """ View k :mod:`dal.autocomplete` pro vyhledávání problémů především v odevzdávátku. """ def get_queryset(self): - nastaveni = get_object_or_404(m.Nastaveni) - rocnik = nastaveni.aktualni_rocnik - # Od tohoto místa dál jsem zkoušel spoustu variací podle https://django-polymorphic.readthedocs.io/en/stable/advanced.html - temaQ = Q(Tema___rocnik = rocnik, stav=m.Problem.STAV_ZADANY) - ulohaQ = Q(Uloha___cislo_zadani__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) - clanekQ = Q(Clanek___cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) - qs = m.Problem.objects.filter(temaQ | ulohaQ | clanekQ) - #print(temata, ulohy, clanky) - #ulohy.union(temata, all=True) - #print(ulohy) - #ulohy.union(clanky, all=True) - #print(ulohy) - #qs = ulohy - print(qs) + qs = m.Problem.objects.filter(stav=m.Problem.STAV_ZADANY) if self.q: qs = qs.filter( Q(nazev__icontains=self.q)) diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py index 03f3404c..4bc7abb8 100644 --- a/odevzdavatko/views.py +++ b/odevzdavatko/views.py @@ -386,15 +386,7 @@ class NahrajReseniNadproblemView(LoginRequiredMixin, ListView): template_name = 'odevzdavatko/nahraj_reseni_nadproblem.html' def get_queryset(self): - # COPY PASTE z api/views/autocomplete.py TODO hodit někam do utils? - nastaveni = get_object_or_404(m.Nastaveni) - rocnik = nastaveni.aktualni_rocnik - # Od tohoto místa dál jsem zkoušel spoustu variací podle https://django-polymorphic.readthedocs.io/en/stable/advanced.html - temaQ = Q(Tema___rocnik=rocnik, stav=m.Problem.STAV_ZADANY) - ulohaQ = Q(Uloha___cislo_zadani__rocnik=rocnik, stav=m.Problem.STAV_ZADANY) - clanekQ = Q(Clanek___cislo__rocnik=rocnik, stav=m.Problem.STAV_ZADANY) - qs = super().get_queryset().filter(temaQ | ulohaQ | clanekQ) - return qs.filter(nadproblem__isnull=True) + return super().get_queryset().filter(stav=m.Problem.STAV_ZADANY, nadproblem__isnull=True) class NahrajReseniView(LoginRequiredMixin, CreateView):