mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

Částečná oprava autocomplete

Browse source 
Už to má v seznamu správné problémy, ale neumí to hledat.
This commit is contained in:
MaM Web user 2021-09-04 17:43:32 +02:00
parent 4321eda97d
commit 5c9632d8fe
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
seminar/views/autocomplete.py
View file

@ -33,15 +33,17 @@ class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self): def get_queryset(self):
nastaveni = get_object_or_404(m.Nastaveni) nastaveni = get_object_or_404(m.Nastaveni)
rocnik = nastaveni.aktualni_rocnik rocnik = nastaveni.aktualni_rocnik
temata = m.Tema.objects.filter(rocnik=rocnik, stav=m.Problem.STAV_ZADANY) # Od tohoto místa dál jsem zkoušel spoustu variací podle https://django-polymorphic.readthedocs.io/en/stable/advanced.html
ulohy = m.Uloha.objects.filter(cislo_deadline__rocnik = rocnik) temaQ = Q(Tema___rocnik = rocnik, stav=m.Problem.STAV_ZADANY)
clanky = m.Clanek.objects.filter(cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) # FIXME: Je tohle to, co chceme? ulohaQ = Q(Uloha___cislo_deadline__rocnik = rocnik, stav=m.Problem.STAV_ZADANY)
print(temata, ulohy, clanky) clanekQ = Q(Clanek___cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY)
ulohy.union(temata, all=True) qs = m.Problem.objects.filter(temaQ | ulohaQ | clanekQ)
print(ulohy) #print(temata, ulohy, clanky)
ulohy.union(clanky, all=True) #ulohy.union(temata, all=True)
print(ulohy) #print(ulohy)
qs = ulohy #ulohy.union(clanky, all=True)
#print(ulohy)
#qs = ulohy
print(qs) print(qs)
if self.q: if self.q:
qs = qs.filter( qs = qs.filter(