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

move: aktivní a neaktivní organizátoři do OrganizatorManager

Browse source
This commit is contained in:
Jonas Havelka 2023-06-11 19:52:22 +02:00
parent 3e30fe188f
commit 0747ede60a
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
personalni/models/organizator.py
View file

@ -8,8 +8,23 @@ from mamweb.models.base import SeminarModelBase
from .osoba import Osoba from .osoba import Osoba
class _OrganizatorManager(models.Manager):
def aktivni(self, datum=timezone.now()):
return self.exclude(
organizuje_do__isnull=False,
organizuje_do__lt=datum
).order_by('osoba__jmeno')
def neaktivni(self, datum=timezone.now()):
return self.exclude(
id__in=self.aktivni(datum)
).order_by('-organizuje_do')
@reversion.register(ignore_duplicates=True) @reversion.register(ignore_duplicates=True)
class Organizator(SeminarModelBase): class Organizator(SeminarModelBase):
objects = _OrganizatorManager()
osoba = models.OneToOneField( osoba = models.OneToOneField(
Osoba, verbose_name='osoba', related_name='org', Osoba, verbose_name='osoba', related_name='org',
help_text='osobní údaje organizátora', null=False, blank=False, help_text='osobní údaje organizátora', null=False, blank=False,

15
seminar/views/views_all.py
View file

@ -100,7 +100,7 @@ def get_problemy_k_tematu(tema):
# nastaveni = get_object_or_404(Nastaveni) # nastaveni = get_object_or_404(Nastaveni)
# context = super().get_context_data(**kwargs) # context = super().get_context_data(**kwargs)
# verejne = nastaveni.aktualni_cislo.verejne() # verejne = nastaveni.aktualni_cislo.verejne()
# context['verejne'] = verejne # context['verejne'] = verejne
# return context # return context
def AktualniZadaniView(request): def AktualniZadaniView(request):
@ -273,18 +273,10 @@ class StareNovinkyView(generic.ListView):
### Co je M&M ### Co je M&M
# Organizatori
def aktivniOrganizatori(datum=timezone.now()):
return Organizator.objects.exclude(
organizuje_do__isnull=False,
organizuje_do__lt=datum
).order_by('osoba__jmeno')
class CojemamOrganizatoriView(generic.ListView): class CojemamOrganizatoriView(generic.ListView):
model = Organizator model = Organizator
template_name = 'seminar/cojemam/organizatori.html' template_name = 'seminar/cojemam/organizatori.html'
queryset = aktivniOrganizatori() queryset = Organizator.objects.aktivni()
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs) context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
@ -295,8 +287,7 @@ class CojemamOrganizatoriView(generic.ListView):
class CojemamOrganizatoriStariView(generic.ListView): class CojemamOrganizatoriStariView(generic.ListView):
model = Organizator model = Organizator
template_name = 'seminar/cojemam/organizatori.html' template_name = 'seminar/cojemam/organizatori.html'
queryset = Organizator.objects.exclude( queryset = Organizator.objects.neaktivni()
id__in=aktivniOrganizatori()).order_by('-organizuje_do')
### Archiv ### Archiv