entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

wip
gitea/authentic/pipeline/head There was a failure building this commit Details

This commit is contained in:
Pierre Ducroquet 2022-10-10 15:24:13 +02:00
parent cc4212686a
commit 8614c58d73
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/authentic2/apps/journal/models.py
View File

@ -142,6 +142,13 @@ class EventTypeDefinition(metaclass=EventTypeDefinitionMeta):
qs = qs.filter(timestamp__gte=start)
if end:
qs = qs.filter(timestamp__lte=end)
if which_references is not None:
qs = qs.which_references(which_references)
if users_ou:
qs = qs.filter(user__ou=users_ou)
x_interval_qs = qs
values = [group_by_time]
@ -155,12 +162,6 @@ class EventTypeDefinition(metaclass=EventTypeDefinitionMeta):
qs = qs.annotate(**{group_by_field: KeyTextTransform(group_by_field, 'data')})
values.append(group_by_field)
if which_references is not None:
qs = qs.which_references(which_references)
if users_ou:
qs = qs.filter(user__ou=users_ou)
qs = qs.values(*values)
qs = qs.annotate(count=Count('id'))
x_interval = x_interval_qs.aggregate(

4
src/authentic2/apps/journal/utils.py
View File

@ -48,7 +48,7 @@ class Statistics:
}
default_y_label = _('None')
def __init__(self, qs, time_interval, x_interval = None):
def __init__(self, qs, time_interval, x_interval=None):
self.time_interval = time_interval
self.x_labels = self.build_x_labels(qs, x_interval)
self._x_labels_indexes = {label: i for i, label in enumerate(self.x_labels)}
@ -58,7 +58,7 @@ class Statistics:
def set_y_labels(self, y_labels):
self.y_labels[:] = y_labels
def build_x_labels(self, qs, x_interval = None):
def build_x_labels(self, qs, x_interval=None):
if self.time_interval == 'timestamp':
return list(qs.distinct().values_list(self.time_interval, flat=True))