IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

#49 Annual report improve

Browse Source 
* improves the filtering of annual report timespan on a date base instead of timestamp base
This commit is contained in:
mpeltriaux 2022-01-05 15:26:16 +01:00
parent a09fdae58c
commit 7caf768709
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
analysis/utils/report.py
View File

@ -64,8 +64,8 @@ class TimespanReport:
responsible__conservation_office__id=id, responsible__conservation_office__id=id,
legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE,
deleted=None, deleted=None,
created__timestamp__gte=date_from, created__timestamp__date__gte=date_from,
created__timestamp__lte=date_to, created__timestamp__date__lte=date_to,
) )
self.queryset_checked = self.queryset.filter( self.queryset_checked = self.queryset.filter(
checked__isnull=False checked__isnull=False
@ -231,8 +231,8 @@ class TimespanReport:
intervention__responsible__conservation_office__id=id, intervention__responsible__conservation_office__id=id,
intervention__legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, intervention__legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE,
deleted=None, deleted=None,
intervention__created__timestamp__gte=date_from, intervention__created__date__timestamp__gte=date_from,
intervention__created__timestamp__lte=date_to, intervention__created__date__timestamp__lte=date_to,
) )
self.queryset_checked = self.queryset.filter( self.queryset_checked = self.queryset.filter(
intervention__checked__isnull=False intervention__checked__isnull=False
@ -400,8 +400,8 @@ class TimespanReport:
self.queryset = EcoAccount.objects.filter( self.queryset = EcoAccount.objects.filter(
responsible__conservation_office__id=id, responsible__conservation_office__id=id,
deleted=None, deleted=None,
created__timestamp__gte=date_from, created__timestamp__date__gte=date_from,
created__timestamp__lte=date_to, created__timestamp__date__lte=date_to,
) )
self.queryset_recorded = self.queryset.filter( self.queryset_recorded = self.queryset.filter(
recorded__isnull=False recorded__isnull=False
@ -479,8 +479,8 @@ class TimespanReport:
legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE,
responsible__conservation_office__id=id, responsible__conservation_office__id=id,
deleted=None, deleted=None,
created__timestamp__gte=date_from, created__timestamp__date__gte=date_from,
created__timestamp__lte=date_to, created__timestamp__date__lte=date_to,
) )
self.queryset_intervention_recorded = self.queryset_intervention.filter( self.queryset_intervention_recorded = self.queryset_intervention.filter(
recorded__isnull=False recorded__isnull=False