rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity

Fix all_adherent and all_has_access function

Browse source
This commit is contained in:
Gabriel Detraz 2020-10-08 22:30:15 +02:00 committed by Gabriel Detraz
parent a01c9e2303
commit 0a427cd30d
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
re2o/utils.py
View file

@ -93,13 +93,10 @@ def all_adherent(search_time=None, including_asso=True):
search_time = timezone.now() search_time = timezone.now()
filter_user = Q( filter_user = Q(
facture__in=Facture.objects.filter( facture__in=Facture.objects.filter(
vente__in=Vente.objects.filter( vente__cotisation__in=Cotisation.objects.filter(
Q(type_cotisation="All") | Q(type_cotisation="Adhesion"), Q(vente__facture__facture__valid=True) &
cotisation__in=Cotisation.objects.filter( Q(date_start_memb__lt=search_time) &
vente__in=Vente.objects.filter( Q(date_end_memb__gt=search_time)
facture__in=Facture.objects.all().exclude(valid=False)
)
).filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time)),
) )
) )
) )
@ -186,15 +183,12 @@ def all_has_access(search_time=None, including_asso=True):
) )
| Q( | Q(
facture__in=Facture.objects.filter( facture__in=Facture.objects.filter(
vente__in=Vente.objects.filter( vente__cotisation__in=Cotisation.objects.filter(
cotisation__in=Cotisation.objects.filter( Q(vente__facture__facture__valid=True) &
Q(type_cotisation="All") | Q(type_cotisation="Connexion"), Q(date_start_con__lt=search_time) &
vente__in=Vente.objects.filter( Q(date_end_con__gt=search_time) &
facture__in=Facture.objects.all().exclude(valid=False) Q(date_start_memb__lt=search_time) &
), Q(date_end_memb__gt=search_time)
).filter(
Q(date_start__lt=search_time) & Q(date_end__gt=search_time)
)
) )
) )
) )